66311fda41
Revert "Adding support for dynamically resolved default layouts."
This reverts commit 667e4d395c.
Change-Id: I1b4b900fa3551f9fe9ec938b89efa5a208001234