Reintroduced contribution that was lost in upstream merge.