63e125986c
This reverts commit 619b8ab8220a7bc87a512d597c19a063d0ca5fa2. breaks google3 see http://cl/223526995 PR Close #27375