Change from tracking time_based_updater and non_time_updater lists separately to just tracking one list