Switch back to upstream jedi