This reverts commit 9c11818e53959318b2914d52978dd7729bd7df88 as it
introduced regression and did not fix the original problem.

Fixes https://github.com/eclipse-jdt/eclipse.jdt.core/issues/3125