LPS-47812 Don't use deprecated API?