Backed out changeset d22ac63d67f1 (bug 967927) for bustage.
CLOSED TREE