Improved fix for bug
https://bugs.eclipse.org/bugs/show_bug.cgi?id=568413

Change-Id: I0000000000000000000000000000000000000000
6 files changed