7466a99dda
This reverts commit 912f3d186f. Revert is needed due to compilation failures due to this PR inside Google.