Patch from RT #84327