This reverts merge request !54590 (merged) in master
It needs to go into 22.0 and then be swept to master