Resync after failed rollback

Let's hope nothing gets broken this time...