GRECLIPSE-1773 Possible fix

Might put a reference comment in here pointing to the bug and why you are doing this.