This reverts commit 45891bed36. # Conflicts: # app/dashboard/views/alias_contact_manager.py
45891bed36