Revert "Merge branch 'jc-change-to-hooks' into 'master'"

Reverting as merging caused build and test failures. Build was a quick to fix in !2194 (closed) but existing tests on master are failing with this apparently due to some global as they succeed in isolation but not when other tests are run as well.

This reverts commit 5a24d961, reversing changes made to 4cd8d0c5.