Backed out changeset 94978dab7186 (bug 863069) for build bustage.
CLOSED TREE