Remove xsi:type from <AttributeValue/> elements. This was basically a hack to get...