Revert "Mainiacman's (Lord_Bubbington) changes"
Merge pull request #30 from vic2mod/revert-22-master

Revert "Mainiacman's (Lord_Bubbington) changes"