Revert "Merge pull request #234 from Tieske/master"

This reverts commit 7179c92915d14106f071fd6738fc2d1a9ab02a8a, reversing
changes made to 6ac24b040d8b89c1f31282b6a674b8770db2fdfa.