Back out 80034b418a48 (bug 844331, part 6) on suspicion of breaking Telemetry submission; r=vladan; a=akeybl