Comment 5 for bug 1433116

It appears the issue exposed some underlying problems with the implementation, which are outlined in the review. I'll reassign this to Tim and defer the decision on how to fix this as he has more information about it.