Revert "I should test my changes before I commit"

This reverts commit 1da5a55f490db7ae59777fced7ad1aad1f2f8d54.
Revert "Moved machine gui registration to the client"

This reverts commit 35bbec9329dc8ff2dbf42a71bf58c613d23b1439.