Backed out changeset 622427e981a8 (bug 789975) for build bustage.
CLOSED TREE