Revert "refracting layouts"

This reverts commit c942919b870cca2c9d993fb760c10ad901de0f23.