Patch for bug#67209