This is the second attempt as the initial fix needed to be reverted.

Fixes: https://github.com/eclipse-platform/eclipse.platform.ui/issues/1210