Hmm… It seems that this cannot be resolved with a user patch… I think you need to raise an issue to resolve this.