Backout Bug 793204 for installation failures. r=me