LPS-36459 Use util method to avoid weird inheritance