Including the change for https://bugs.eclipse.org/bugs/show_bug.cgi?id=401271