See summary.
Created attachment 32020 [details] patch
Comment on attachment 32020 [details] patch r=me!
Landed at r45352.