Re-created patch for issue: 2247685.