This reverts !1480 (merged) and fixes a faulty return that could cause the resynching code to break in some situations.
This reverts commit c51c4787.
