Fix for https://bugs.eclipse.org/bugs/show_bug.cgi?id=453484

Change-Id: I297dec0b74d7324e94555f1285e0e0dd565b98bc