Applied to the trunk with option renamed to be --delay-updates.