Fix duplication of efforts caught by @dofelw
Merge pull request #1501 from sigmavirus24/remove_setting_of_hooks

Fix duplication of efforts caught by @dofelw