This reverts commit 46013fc1. The original commit efbc8bb1 is failing on several bots, so reverting this follow-up commit as well as the original commit.