Unregister client IDs correctly
Merge bug25887
stable to default