Revert SOAP-984 (SOAPUI-4111/SOAPUI-4149) and SOAP-984 (SOAPUI-4111//SOAPUI-2796)