Issue #23903:drop deprecated overload