Revert pythonpath workaround

Change-Id: I37c0e255a3872adcb4ac7b305df94d7c740c6f4b