Comment 8 for bug 1167429

Thanks Enrico and Cedric! I found that I had to combine both your solutions and add a change to actually get the context to the server side to fix this issue. See the merge proposal.