This reverts commit 7d7bb5c861. Still the CIs are flaky and the commit just slow down them.
7d7bb5c861