Removes use of ID tokens

Reviewed in https://codereview.appspot.com/13798045/