Partial revert of 9bc2f43f2a1 : introduces VS2010 error