Revert "Merge pull request #23 from dmedov/dev_linux"

This reverts commit 33ec4cbf55958082f81b82ea072b92aa607fb524, reversing
changes made to fc99ecd1223f8b14fd689afdb96f2952b9948e94.