Revert "Merge branch 'filling-in-layout'"

This reverts commit 73f8d7a63ec6b6ab2fc84882f3250e38cc1002fd, reversing
changes made to a3999dab4d0448a614a64e51af5ace4bb715c336.