Work around MSVC bug

Change-Id: I592eb027f4c13cf75f1f0a443696d4d4e8e50e04