Commit #16325 fixed one thing but broke DH with certain moduli.