Apply patch from RT #82012