Revert bureaucracy changes made on 3/25 w/o pull request

Here, I've made it easy for you.