This reverts commit 0a70360eb6. That's because it caused issue #129366 which is much more serious, and the cause is not obvious so far. Another fix will be submitted for the original issue.
0a70360eb6