Revert "Merge pull request #19 from MorganDawe/7.x"

This reverts commit 2a6d4e623a60fe8a588399f3b406367ff9510c06, reversing
changes made to 5bac30ca73d6fc9f55841ee79e1c3c2f5e700f13.