Revert "Fix for Microsoft compiler"

This reverts commit 8f725f290f9703871e3d47a22886828a42e17743.