Revert "GRECLIPSE-1700"

This reverts commit 6a7bdea7acb6ced150628e3c45997ff0a5ff7c50.