Revert "Fix full-eng build breakage due to dbacd826a100f2c."

This reverts commit 6e39c88b1e4ea00e76e0d66e764a63b5d8c883fc.

This change should not have automerged to nyc-dev. Still investigating
why that's the case.

Test: make
1 file changed