Functionally reverts a80d4329ce96856a02bd279c800c3d08619da4c9, with new test. This should be applied somewhere, but this is the wrong place. Fixes regression reported after #182444
Functionally reverts a80d4329ce96856a02bd279c800c3d08619da4c9, with new test. This should be applied somewhere, but this is the wrong place. Fixes regression reported after #182444