Revert "Merge pull request #7 from aogilvie/v3.0"

This reverts commit 77eb9a0df4670ed33e8589bde38867aeb969bbf2, reversing
changes made to e4012628d2c4b1259710a6cfbe37bcfc0f313af9.