A different version is being proposed in another currently open PR here https://github.com/wildfly/wildfly/pull/4437/files#L29R83. Please co-ordinate with Gunnar to decide which one should be used.