Revert "Two levels of bring for User#role"

This reverts commit 56828c2a96d384b4d98a30f6e0873092e195ec64.
Revert "Safety check for User#admin?"

This reverts commit 9e136383f050612bc0cbc27542c9731afb4b7249.
Revert "Only bring role if needed"

This reverts commit f993f4a21522a7dca300cea194f8fa7a9ca9ac75.