Forgot to remove some HEAD references from the last merge.