Messy way to fix up buttons
Revert "always allow hardware to be Disabled"

This reverts commit 501c96cc37e9a8d6ca5e4a9cb2f105d051eea8a8.
Revert "Messy way to fix up buttons"

This reverts commit 794805d7d9be93d54988509f8ff1f76a023466ef.