Revert^2 "Fix incompatibilities with Kotlin 1.5.0"

c5b4071877530ba3eb6ce5f55fc8c101ea1f35e4

Change-Id: I1fc09f028411cce8bdaa9eec68eaf88116f2143f
(cherry picked from commit b715c4d7301d45b8e2ff0308ee6eefc6ffdee2f0)
3 files changed