Comment 4 for bug 1122472

clearing g-3 milestone, we'll have to sort this out in H - I'll speak to the keystone folks and offer to implement the blueprint above which we'll need to fix this bug