LPS-44452 Revert everything until we fix the broken tests
LPS-44771 fix errors