This patch has limited testing w.r.t. whether the bug is completely
gone, but it appears to have no negative side effects, and fix at
least one case.