This reverts merge request !50366 (merged) because it causes several unit test failures (ATLASRECTS-6820).
Will merge this for tonight in case no other fix comes forward.
This reverts merge request !50366 (merged) because it causes several unit test failures (ATLASRECTS-6820).
Will merge this for tonight in case no other fix comes forward.