REVERT: Core/RBAC: Simplify RBAC implementation (FOR NOW)