Revert "Merge pull request #67 from ajstanley/7.x"

This reverts commit 750b74c1957d6e4946fb39bae9c7ef5351923c0a, reversing
changes made to 27326be9323d8c29b8cb5474a0b2974c481e47d2.