Merge "Remove DH keygen special case"