This reverts commit d2460d90. Reverting this commit because after pushing to main it caused unexpected test failures.