Revert "Merge pull request #45 from alphagov/quick-fixes"

This reverts commit 026ebe2d09f2ffe780eaf5be8cd81a23a2237f70, reversing
changes made to 9d0f630199bd30978c75be6db7c145d303adfd89.