Second try at fixing VS2010.