Revert "Merge pull request #1 from wood-pete/testbranch"

This reverts commit bdad7a59219a6a6ce487f0140b0572e5dbde4f23, reversing
changes made to 98247053d906e7c345b28573f6ac1e09e58dd049.
Merge pull request #2 from wood-pete/testbranch

Revert "Merge pull request #1 from wood-pete/testbranch"