Revert r201772 as it breaks things on Windows

We should probably use different argument types on different platforms?