removing cxf specific workaround