Remove some premature changes (cherry picked from commit d7950a1)
Remove some premature changes
(cherry picked from commit d7950a1)

JetBrains/intellij-scala-historical,consulo/consulo-scala,triggerNZ/intellij-scala,SergeevPavel/intellij-scala,SergeevPavel/intellij-scala,LPTK/intellij-scala,LPTK/intellij-scala,JetBrains/intellij-scala-historical,triggerNZ/intellij-scala,JetBrains/intellij-scala-historical,SergeevPavel/intellij-scala,LPTK/intellij-scala,triggerNZ/intellij-scala