943a064
Revert "Auto-sync with upstream master." to work around 1209451 This reverts commit 3d147acd8dcfd7ee6e3f714e5a5c08617d7c997b.