Revert "Merge pull request #42 from joostn/master"

This reverts commit 0d5e9667e46031d78e61d96a785337a056aa831c, reversing
changes made to ade5ccd317e27add04e87eb29e3505c8fe8a23e0.

See http://redmine.laoslaser.org/boards/3/topics/765?r=785