revert changes for CXF-5732