Undo cp_menu changes for 3.1 #1383 #1384

Moved to 3.x instead