This MR contains a cherry-pick of a commit which was included in !3398 (merged)
but not in its v9_11 backport, !3449 (merged).
@marka: is this just a simple omission or am I perhaps confused about
what is happening here and this MR should not be merged after all?
Closes #1764 (closed)
This will create a new commit in order to revert the existing changes.