Revert "Fix for #30"

This reverts commit bfdd52ade09b4f8ee74e5c9c888a5c76fa60f4b8.
That wasn't working. :(