LPS-44452 Revert everything until we fix the broken tests