re-do change that got lost in upstream merge