Note that upstream closes #680935