Patch done!
Created attachment 14696 [details] patch
Comment on attachment 14696 [details] patch r=me Do we have enough test coverage for this?
Landed in r 21714.