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