LPS-46712 Don't use deprecated methods