LPS-34751 Rollback changes because of broken tests.