Backed out bug 918797, r=me