Patch forthcoming.
Created attachment 26018 [details] Proposed changes
Comment on attachment 26018 [details] Proposed changes Looks sane to me, r=me, in case nothing is broken.
Landed in r39666.