Switch to upstream (fix merged)