undoing vs2013 migration to comply with master branch