Zebediah Figura : msi: Remove a superfluous substructure.