cherrypicked from 1.65-archive