This reverts commits 33671f54 and 52fdc8e5. These commits introduce a bug in the generation of python modules: shared objects wrap.so have been renamed but __init__.py files still try to import them with the old name.