This reverts commit 2105c32b. Reverting this follow-up commit as a prior commit (2107d87c) is causing build bot test failures.