Revert "Fix: hookmanager code"

This reverts commit 89c3cfec3a943352aed6432cd884903751005110.