This reverts commit 52c1af8db2b3533e139f5c558391eb319687083f.

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