My changes got merged, so use the upstream again!