It needs a scrubbing!
Created attachment 19335 [details] patch
Comment on attachment 19335 [details] patch r=me
Landed in r30555.