Instead of calling hook handler directly, trigger the hook

Making room for some more refactoring

Change-Id: I9b727964e46c680b34cbb61379b20e35a58ce523