Remove erroneous import caused by bad merge.
Merge branch 'fix-bad-merge' into playground