This reverts commit 97e07d0c. Reason: OSX broke for a different reason, this really only seem to work on linux and very generic windows builds