Revert !105611
What does this MR do and why?
Reverts !105611 (merged)
backend review was missed and the backend change is a possible breaking change to the public API. Reverting until we can get feedback on that backend change.
Edited by Peter Hegman