Revert "Test alternative layout."

This reverts commit 7d6acb79b237b48b20e85716115badfb3bfe2dca.