restore structures from previous erroneous commit