Patch in a moment.
Created attachment 14671 [details] patch
Comment on attachment 14671 [details] patch r=me
Landed in r21655.