IDEA-63378 Switching threads should be optional, not forced