reverted yesterday's xsd merge