Last-minute fixes

LJ Sonicrequested to merge
final-hours into next

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

Merge request reports