Patch coming.
Created attachment 23368 [details] patch
Comment on attachment 23368 [details] patch r=me
Committed revision 36464.