removing spike's upstream, thanks spike\!