Put __add_optional_parameters() back (for now) to avoid breaking existing code.