Revert "Merge pull request #127 from ministryofjustice/APOLLO-3946"

This reverts commit 905826e6a12086fd8b29da258e7f00956e2005c6, reversing
changes made to d2fc85750f618b9ba2434743abb64de2d3830172.