Remove hacks. See #63
Merge pull request #174 from jhasse/patch-hacks

Remove hacks. See #63