diff --git a/bgpd/bgp_attr.c b/bgpd/bgp_attr.c
index 8144cd3..7c0f6cc 100644
--- a/bgpd/bgp_attr.c
+++ b/bgpd/bgp_attr.c
@@ -559,10 +559,7 @@
 {
   struct attr attr;
   struct attr *new;
-  
-  memset (&attr, 0, sizeof (struct attr));
-  bgp_attr_extra_get (&attr);
-  
+
   bgp_attr_default_set(&attr, origin);
 
   new = bgp_attr_intern (&attr);
diff --git a/bgpd/bgp_route.c b/bgpd/bgp_route.c
index cb15c15..68eae6a 100644
--- a/bgpd/bgp_route.c
+++ b/bgpd/bgp_route.c
@@ -2465,7 +2465,7 @@
 bgp_default_originate (struct peer *peer, afi_t afi, safi_t safi, int withdraw)
 {
   struct bgp *bgp;
-  struct attr attr = { 0 };
+  struct attr attr;
   struct aspath *aspath = { 0 };
   struct prefix p;
   struct bgp_info binfo;
@@ -3270,8 +3270,8 @@
   struct bgp_info *new;
   struct bgp_info info;
   struct attr *attr_new;
-  struct attr attr = {0 };
-  struct attr new_attr = { .extra = 0 };
+  struct attr attr;
+  struct attr new_attr = { 0 };
   struct bgp *bgp;
   int ret;
   char buf[SU_ADDRSTRLEN];
@@ -3423,7 +3423,7 @@
   struct bgp_info *ri;
   struct bgp_info *new;
   struct bgp_info info;
-  struct attr attr = { 0 };
+  struct attr attr;
   struct attr *attr_new;
   int ret;
 
@@ -5352,7 +5352,7 @@
   struct bgp_info *bi;
   struct bgp_info info;
   struct bgp_node *bn;
-  struct attr attr = { 0 };
+  struct attr attr;
   struct attr attr_new = { 0 };
   struct attr *new_attr;
   afi_t afi;