fix provide_automatic_options override (#5917)