Revert "S73119 Code to optimize layouts"

This reverts commit 0ab84a7208b3506d316fced59a21d54dee9e9f97.