This reverts commit 5c48cd30b5. Reason: that change introduces race conditions on CI. PR Close #41707
5c48cd30b5