Retry from scratch

Change-Id: Id7d556f3384e14a3f780626c78f4b8fbde0f90de