Revert r52336 "Merge maintenance-work branch:"