Backed out changeset 1df122edcf0d (bug 823978) for bustage (again).
CLOSED TREE (again)