This reverts commit 73f0deef6d. It prevents 2943d30b0c, which causes high flakiness, from being reverted.
73f0deef6d
2943d30b0c