removed another whole lot of code previously added as a hack and try/error
removed another whole lot of code previously added as a hack and try/error

WoLpH/jedi,jonashaag/jedi,jonashaag/jedi,mfussenegger/jedi,dwillmer/jedi,WoLpH/jedi,flurischt/jedi,dwillmer/jedi,tjwei/jedi,tjwei/jedi,mfussenegger/jedi,flurischt/jedi