LPS-35373 Rollback