Update because of the foo_opt => foo break change.