Backed out changeset cabe3163d4bc (bug 1047560) for conflicting with the automated HPKP preload list update