Yes, but in asking users to add an explicit `return_indicator=True`, you then need a separate deprecation cycle, unfortunately.