do like in upstream