Comment 6 for bug 1592546

Henry: yep we're on the same page.

Please have a look at the updated patch; I'm hoping it addresses the root cause.

Also I spoke to the "old" bug owner and they are fine with me taking this over.