Here is the patch for this bug again, against the current master. Does anyone have
any feedback? If not, I will push this in a few days.