LPS-33403 Don't use deprecated API