Change was merged into 1.0.x instead of 1.1.x.
Reverted 1.0.x.
New MR to merge into 1.1.x.
Closes #3486463