Revert "[bug 905834] Changed sys.path arrangement"

This reverts commit 2a889fb2dd85b702842fe445cad26391fe1b64fa.