LPS-51814 Take a simpler approach