Change workaround for redeclaration problem

Without this hack, redeclarations are reported when you try to rewrite *Range
classes to Kotlin
Buildserver auto merge