back out last commit and deal with how cuisine conflates update and upgrade

this should be fixed in the future