This reverts commit 6eb3d20b47. Reverting this because it might be the cause of some test flakiness.
6eb3d20b47