Revert "Merge branch 'layout'"

This reverts commit bf6a83a31bf299975688287c10cc5d3d98d7ad72, reversing
changes made to f28a160e2416a54fb4f83ae57d82aff5fee5d217.