Revert r205646 (keeping the test in its modified form) as
it is subsumed by r205521.