I wonder if there should be a setting to force the old behaviour.