Merge "Revert "Structure layout logic cleanup.""