We have to figure out another way. There are perfectly valid reasons not having a layout for a page (I have have some broken sites as result of this). See #1313 This reverts commit b15934008f.
b15934008f