The fix for bug #7142 once again introduces bug #6787. Note that the patch proposed by myself for #6787 is automatic, rather than expecting manual configuration as in the botched #7029

I have refreshed the patch on top of the current master and will submit a pull request shortly.