Simplify hooking

Change-Id: Ibaec74bc0f88f03c24870524f2605c8f61603205