Use the user's OLD_master during a sync if it exists