Switch to proper layout, again.