Backed out changeset 3f8a7062ad8d (bug 978203) for build bustage on a CLOSED TREE
Automatic merge