REVERT: Fix to previous issue appears to go further than necessary, and might be a cause of desyncs.