Revert "Experimenting with different client ID."

This reverts commit 6b48e6cbccf3c989f5fed015499f9ce5be8d71d8.