Merge "Update script now that optimizing is default."