LPS-35724

This needs further analysis. Revert for now.