Remove unnecessary hack. Fixes #69 and #71.