Subtask of bug 14868.
Created attachment 16928 [details] Patch Please take this albatross off my neck.
Comment on attachment 16928 [details] Patch r=me
Committed revision 27199.