Attached are the two patches I mentioned in the bug report.