Try to fix MSVS build after r222384. No intended behavior change.