Revert "Merge pull request #405 from chrisfcarroll/master"

Because the commit didn't work and the simplest first step is to revert it.
This reverts commit d9a4e7a340cff301d55f39a7801469a278d7fa11, reversing
changes made to 8c32aea999c9b40d83617c669daffce1781e15f2.