LPS-32381 Rollback changes