Re-introduce change reverted from https://github.com/OpenLiberty/open-liberty/pull/32564