Revert "Sync revert and finish resize on instance.uuid"

This reverts commit d27987fa56156392c06b1185b44e36dc9720435c which
actually seems to have retriggered the issue it was designed to fix.

Related-Bug: #1326778

Change-Id: Ia1905177de8494f9c3abb3bcfa0866c7bcb33f93
Merge "Revert "Sync revert and finish resize on instance.uuid""