Revert "layouts"

This reverts commit edf72a684d6299b56847ad07917ec7edd8d9e940.