Make the current version working with visual studio again
(from redmine: created on 2011-09-09, closed on 2012-02-01)
