Revert #87
Merge pull request #92 from akkie/master

Revert #87