[WIP] Bug 1026426 — Handle short URLs

we actually can remove the tokenlib + its tests here.