Trying revert again.
This fixes #7