Remove hack workaround for SPARK-668.

Renaming the type paramters solves this problem (see SPARK-694).

I tried this fix earlier, but it didn't work because I didn't run
`sbt/sbt clean` first.
Merge pull request #475 from JoshRosen/spark-668

Remove hack workaround for SPARK-668