Revert the more hacky of the layout tweaks.