Backport rev. 3ae74b361f53 to 2.7 branch.