Revert "v3.5 - start about new layouts"

This reverts commit b1602c12ecbbdf2e8e5bfa0f03dfc928f0502c73.
Revert "merge"

This reverts commit 39b7f170710d281981235c90cf339040994dd800.