LPS-49294 rollback static fields into instance fields