Re-sync to CM, minus the overlays