Revert "Fix compiler warning C4800 in Microsoft VC 2013 Express"

This reverts commit b976d14956eef1e45e7c37dee65f399c471cf96f.