Revert "Note that upstream closes #680935"

This reverts commit e6755dd62a1be0a1f015efe818422756d04cad0d.