31835f1921
As a side effect, this fixes https://youtrack.jetbrains.com/issue/KT-43887 (cherry picked from commit 387c09e7aed7666f5a178b2ac342fb17ed3cdda3)