Backed out changeset 1885bc168943 (bug 811392) since the patch it depends on has now been backed out on a CLOSED TREE