Backport of r77429. Not merged/blocked as svnmerge.py is not liking me right now.