Remove workaround for rust bug mozilla/rust#11040.
Merge pull request #160 from bjz/remove-workaround

Remove workaround for rust bug mozilla/rust#11040.