Get Ehsan's committer patch on here for bug 835202