Comment 7 for bug 1644428

For the record, this just needs to be verified to fix the regression and still generally work. This should *not* be delayed for the usual 7 day maturing period as this fixes a regression.