Revert moving import (must be after edit PYTHONPATH)