Backed out changeset 77052db08766 (bug 611388)
Backed out changeset b6d6ee031d40 (bug 611388)