Revert "Merge pull request #70 from andreas-schwab/master"

This reverts commit ba90ce5681d62a23e01e9bb57886e45211dc7086, reversing
changes made to 6abaa0ba61c72be75c3da87aec92cb3799f193d7.