FIX: Allow previous possible fix to some desyncs to work in the current (11.x) version