Fix comment cid finding
Fix comment cid finding

We were doing silly things before that didn't actually work, splitting
out the unit tests made it show up that it only worked due to fallback.

Now, it should work like I planned.

thowe/xdeadly,afresh1/xdeadly