Revert "Revert "Mayor System Fix""

This reverts commit 8307d5ce3cadd33df1a95ec3bfc5758c7e91eafd.