Cleanup obsolete bug workaround introduced for Scala 2.10.
Merge pull request #92 from huitseeker/SI-8205-cleanup

Cleanup obsolete bug workaround introduced for Scala 2.10.