This reverts commit 7f3121bec4.
Reason for revert: The retrying doesn't work and always fails with
"java.lang.IllegalArgumentException: cannot chain ref update" and as
a result the user gets non-understandable error message.
Change-Id: I6a5c8ea4aabaf2cafba7a551cb6a1156c2751948