This reverts commit r292662.
This change broke internal builds. Will provide a reproducer internally.