Revert "Core: Fix build for vs2014"

This reverts commit e3034511890f4c918d758a6b6b239c14f10b75e2.