GRECLIPSE-1789 Reverted