Re-created patch to pass validation on issue: 2247685.