Import changes to burocrat
Revert "Import changes to burocrat"

This reverts commit b70c5a971cecba98b3a6719f930a5302fad78aaa.
Merge branch 'burocrat' of https://github.com/collective-congress/collective-congress into burocrat