Backed out changeset c2659bf5793d (bug 1107145) for bustage.
DONTBUILD CLOSED TREE