Another attempt to repair trunk for VS2010