Revert "Merge pull request #75 from Merglasch/daniel"

This reverts commit a96f61d1661f01b25b32f748dee765a238ae9e13, reversing
changes made to d6f8ba1daedd9e725af11fe10d95c4687f277b27.