Revert "Merge pull request #17 from MI-6/Whatever-you-wanna-call-it"

This reverts commit 17e9d63baff1f49df8304ae680be24f2ac363378, reversing
changes made to 3cce17c7044a04f9eeca8f340739525e2b45f510.