Revert "GRECLIPSE-1801 fix"

This reverts commit 6fdeb698ba6d379ff7678df08641a92071ec0d05.