Backed out changeset 51a41b139305 (bug 920831) for bustage.
CLOSED TREE