Removed the fix for #57, which was upstreamed.