Undo cbp changes