Try again after fixing the hooks

Change-Id: I693ff3216bf52f556eaec61b1e59a0c29057ad53