Backed out changeset f804fcc84df2 (bug 912489) for build bustage