Reverting split of clientID. Fixing future errors if we decide to split anyway.