9041dac3.  The correct fix was
f4227c82 "Blind fix for MSVC, take two."

Change-Id: I6c319a0f7a1d3dbcffbd4be8ac02682e5fdd7802