[SSM-154] Restore previous API for the benefit of subclasses