Revert Fix: for hook registration. Needs more testing.

This reverts merge request !1310 (merged)

There are no tests to assure that this will not result in a hook being duplicated on registration. This could result in multiple instances of the same hook being triggered in an unpredictable manner.