[FIX] Revert pull request 354

Undo PR #354 until compiler errors on Windows < VS12 are fixed.