This reverts commit 62a8c7ba, reversing
changes made to a9c94736.

# Conflicts:
#   libraries/database/broadcasts.py
#   libraries/security/user.py
#   libraries/security/whitelist.py