partially revert of fc6a25a6a1d46627eae34f4aeab98cafb71a5f70

https://github.com/eclipse-jdt/eclipse.jdt.ui/issues/1051