Oops, I posted the wrong patch. Please ignore the first attachment. I will add a new one in a moment.