Remove the VS2012 update 2 workaround now that update 3 is out.

This reverts 0d6bec3, 8d50410 and da78edb.