Revised fix for https://bugs.eclipse.org/bugs/show_bug.cgi?id=578079

Change-Id: I42328dc7f9e1647361524243e00f6f39b42e5710
4 files changed