Update hacking for real

Change-Id: Ifa8af9a426c831b26e79b727b01de76b07c50b21