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

Re-created patch to pass validation, and to not fail on apply.