This reverts commit d483730d. This allegedly breaks a significant part of facebooks internal build. Reverting while we wait for them to provide a reproducer of this from @wlei.
