Backed out changeset 65cda04dc8d2 (bug 1064432) for bustage on all platforms.
CLOSED TREE