Revert migration to Kotlin