See check-in [573499eaf2].  Testing is still needed to determine if this will fix
the issue for Visual Studio 2012 while still allowing Visual Studio 2013 to work
as well.