Revert "Reference layout"

This reverts commit 716ae200592de2c9d84887c305904eb4f15d882d.