Remove erroneous import caused by bad merge.
Merge pull request #315 from glowe/fix-bad-merge

Remove erroneous import caused by bad merge.