* Clean up multi_upgrade * Correct variable names * Correct variable types
This reverts commit 440113f97c.
440113f97c