Continue slaying heads of the Hydra

Change-Id: I3825013136de7c074954accf2ee961faff59b081