Backed out changeset 461d5599aa8c (bug 977372) for bustage.
CLOSED TREE