Gid told me I could do this....
Revert "Gid told me I could do this...."

This reverts commit 83ce18871bbfc522efef7fc53c57d2a70f1d01ec.
Revert "Revert "Gid told me I could do this....""

This reverts commit 99c02f73586bc733803c5c08ed521d1a851ef0a7.
Mods/screwup removal