This restore unsupported, de facto behavior that was dropped in 80516e88 but that it turns out a lot of folks have been using.