s4:samba3.py/upgrade.py: Revert

s4:samba3.py/upgrade.py: Revert

This reverts commit 2175c0ed0649d545ea833d50e8d33fbee9051c35.
This reverts commit 6c3e2417a0639cd7c367de93615c422cf5217456.
This reverts commit dbb8989e05ac3189a5eca11fa40d572388ea02fc.
This reverts commit 82adfa39b75aa628c88f828278c6ac09335d1a49.
This reverts commit f299efa8f05c6a5b739222bdf75690a4591d3650.

After a small discussion with Jelmer we agreed that this isn't the right way
to fix the problem. We should wait for a real patch rather to rely on temporal
hacks.