LPS-50049 Revert broken changes