I will post a patch for review.
Created attachment 21542 [details] Proposed patch
Comment on attachment 21542 [details] Proposed patch Cool, r=me
Landed in r34411.