Merge from 3.3: Undo changes accidentally reverted in de8787029fe4.