This facilitates other changes like refs #28160. Backport of 890537253cf235091816d27a5c2fb64943c8e34a from master