Work-around MSVS build breakage due to r208148