[FIX] Revert pull request 282

Undo PR #282 until it compiles on Windows < VS12.