Revert "Add support for the following attributes in layout.conf to allow more"

This reverts commit 4c409a049c394389b1de398db511380e2fed0437.
This needs to be submitted for review and approval.
5 files changed