Revert "Merge branch '22.0-dq-merge-memory' into '22.0'"

This reverts merge request !54913 (merged)

@jmaurer , creating this revert MR to be ready, in case we decide to really revert.