s4:samba3.py/upgrade.py: Revert