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

This reverts commit 5b2bc76d7de4cbcbafc8b5a6f7dd58d943624902, reversing
changes made to 2dc6ec462a7d3e85c9e56ba0b4baac323075abc5.