Revert "Initial changes for Linux support"

This reverts commit 029fbc30248fe7335501f7956b25cfdc038129e5.

The above commit appears to have broke our CB.
2 files changed