Unregister client IDs correctly
Merge bug25887