Revert workaround for #945, as it causes problems in the JUnit view

[trancexpress]

We revert the changes from:

#946
#1022

Since there are other regressions we see, such as showing the string comparison dialog not working.

What it does

How to test

Author checklist

• I have thoroughly tested my changes
• The change is following the coding conventions
• I have signed the Eclipse Contributor Agreement (ECA)

[iloveeclipse]

I've created #1216 to describe what is actually the problem we are trying to fix here (or revert changes that causing it).

I've also pushed #1217 that should address issues without reverting.

[iloveeclipse]

As discussed, let merge this one for RC1, and try again with reverting revert & #1217 for 4.32 M1