Hopefully fix the MSVS build after r184105