Backed out changeset 4aeb00521c9d (bug 896890) for build bustage.
CLOSED TREE