#968994 Speed up update.