Revert pull request #94
Merge pull request #98 from atom/revert-94

Reintroduce #92