This brings in the necessary fix to satisfy #2989 without dragging along additional vendor updates reverted in #3019.