This reverts merge request !60974 (merged) - some problems showed up in the ART tests, which did not appear in local tests. Reverting while we understand what is going wrong in the other tests.
This reverts merge request !60974 (merged) - some problems showed up in the ART tests, which did not appear in local tests. Reverting while we understand what is going wrong in the other tests.