Revert two backports to release/1.2 that broke fate.