Can we use the original upstream instead?