This reverts commit 95d354b18f1b80cee514705869612f7c17488f19.

Change-Id: I34cb1282afec6f8de6f39f73ec81d752a228b8a3
Reviewed-on: https://git.eclipse.org/r/c/jdt/eclipse.jdt.core/+/181187
Reviewed-by: Manoj Palat <manpalat@in.ibm.com>
Tested-by: Jay Arthanareeswaran <jarthana@in.ibm.com>