Revert "Mayor System Fix"

This reverts commit ff620b71788e4a2741ccaba9ca67425ca4e6f4aa.