Patch for issue 8920.