Cherrypick 0495fb 2a858 from v1.65-broken.