[CXF-5311] One more refactoring