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