Backed out changeset 2d644b3b7063 (bug 649490)
Backed out changeset e0e9651d0faf (bug 649490)