Revert "Fix build problems with visual studio 2013"

This reverts commit d0e8be9d19cb3b0ab430a71f2309d9a07aec1362.

Change-Id: Ic9956bfc6e1e05fc9656ed8cfb5c4547d692a412
Reviewed-on: http://review.couchbase.org/29898
Reviewed-by: Trond Norbye <trond.norbye@gmail.com>
Tested-by: Trond Norbye <trond.norbye@gmail.com>