LPS-35886 Use the super implementation