Revert "Merge pull request #6 from mlazowik/fix_reverted_pull_request"

What a mess!

This reverts commit bb18f4a3a1168bcbe7ff9e708a43ef888c371292, reversing
changes made to 6146726cfe71066e5bbdfee21a9ac97b5d64bfa0.