Fix package.el upgrade regression