Revert "(QENG-431) expanded and improved role support in beaker"

Merged this PR during a dot release by mistake.