Comment 23 for bug 1669468

Change looks good, I will work on a client side logging patch set aimed to make debugging this easier in the future. I feel like this could have been an easier debug with some better logs.