Backed out changeset 8164fe57ac92 (bug 1010434) for bustage.
CLOSED TREE