Simplify sync local tempest

This behavior was done by two steps that was equivalent to this one. It
is also more readable/easy to understad.

Change-Id: I0fe944c3dbad477509fb3d58a9d875346ca4ab9e