Comment 13 for bug 1202952

I'd still like to test each branch & token backend at the API level, but at first glance, it appears that ayoung's fix wouldn't produce the expected API response as Kieran cites (missing the "expires" attribute for each token).