Reverts 93a5bfc

Fixes #54