The workaround for https://youtrack.jetbrains.com/issue/IDEA-116898 is fixed now, so we can remove the workaround.