Merge "Revert "Fix incompatibilities with Kotlin 1.5.0""