Patch forthcoming.
Created attachment 216328 [details] work in progress
Created attachment 216336 [details] the patch
Landed in http://trac.webkit.org/changeset/158891