Apply patch for upstream issue #213.