Revert "changes to make it compile on mac"
moved this to a new branch

This reverts commit f6a0b43082226d3e01e0a070a3e4c4fa6d5ed2ee.