Use retrying instead of our custom code

This pulls in retrying that handles the retry logic better than ours
custom made one.

Change-Id: Iedf00e245702add4cf122ed39732378de44eb3db