Revert "Merge pull request #22 from rnowm/951593"

This reverts commit dc5ca96695cab87b4c2fcd7c9f046ae3415a70a5, reversing
changes made to 96cdde4b5b5d8d3785b36c3c68cd746aff3005cc.