This reverts commit 227db86a. Causing debug info errors in google3 LTO builds; also causes a debuginfo-test failure. (cherry picked from commit 394db225)