Reverts 93a5bfc

Fixes #54

Confirmed that this fixed it for me, using ST2