Partially reverted refs #27054 except for one of the tests as this solution supersedes that one. Thanks Shai Berger for the review. Backport of 098c07a03286b5ed133102733e67a83061647ea0 from master
Thanks Simon Charette for help.