Backed out changeset 4b4c7462ec89 (bug 1087378) for bustage.
CLOSED TREE