This reverts commit 604 as the upgrade tool should not be in the 1.3 branch. Reviewed-by: schreiberal