LPS-33207 Make it backwards compatible