Patch forthcoming.
Created attachment 14751 [details] patch
Comment on attachment 14751 [details] patch r=me
Landed in r21832.