[Unchecking patch as a fix since development has moved beyond it; it's not a sponsorable fix any longer.]
[Unchecking patch as a fix since development has moved beyond it; it's not a sponsorable fix any longer.]