Reverting 83d71da. VS2010 fix.