revert to old OneStruct