Follow our own Hammerhead

Change-Id: I17c38c3938e46cf36291f1ffc8b02a615ff0aa2c