This change fixes the WSDL build. I am aware that it removes a bit of flexibility...