Revert some of the Linux stuff from a few commits ago.