Revert "Merge branch 'a_mcdonald-master-patch-11504' into 'master'"

This reverts merge request !86096 (merged)

Braking change has been reverted

MR that reintroduces the initial change with fixes: !86123 (merged)