Go back to the new world order.

(Also fixed indentation.)
Signed-off-by: NTakashi Iwai <tiwai@suse.de>