[CXF-5907] Undo