Don't be too modern for MSVC2012

Change-Id: I6f9049f6b5261f6099e97c7f10d6ab6ea7eaab9b