[#82505964] Use base class behavior, where possible.