Revert "Refactor Mayor"

This reverts commit 5da08f775c870328d9fa5ddb903906b1d6b68952, reversing
changes made to 0d42329625162933466fe2b95bd518d1e5136b30.