oops, disabled survivors by accidental merge

Change-Id: I33c217fbf59126305766c2caadfddbeee4cb3b36