Revert "Updates for Linux compatibility."

This reverts commit 5ac93661001aa3d7ef9168d65a17166e94d00979.