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

This reverts commit be106c61b0a0ec38b891d94bca4864b83870ca94, reversing
changes made to a73b40026d3333738b8137b3f251b489d8917dc7.