Revert "Merge pull request #507 from zero-degrees/5-8-linux"