Narrow it down a bit for the next visit.

Still no idea what the problem really is (MSVC is pretty silent about it)
or how to fix it.

Change-Id: I322779046f0adc0b2807a9d46a5c9140839b7ff7