diff --git a/.mailmap b/.mailmap
index c427c16681a..e5ced35ebba 100644
--- a/.mailmap
+++ b/.mailmap
@@ -9,6 +9,7 @@
 <ant@openstack.org> <amesserl@rackspace.com>
 <Armando.Migliaccio@eu.citrix.com> <armando.migliaccio@citrix.com>
 <brian.lamar@rackspace.com> <brian.lamar@gmail.com>
+<brian.waldon@rackspace.com> <bcwaldon@gmail.com>
 <bschott@isi.edu> <bfschott@gmail.com>
 <cbehrens@codestud.com> <chris.behrens@rackspace.com>
 <chiradeep@cloud.com> <chiradeep@chiradeep-lt2>
diff --git a/nova/image/glance.py b/nova/image/glance.py
index 9eea8eb4c35..2a24d534ea8 100644
--- a/nova/image/glance.py
+++ b/nova/image/glance.py
@@ -435,7 +435,7 @@ def _convert_to_string(metadata):
 
 
 def _limit_attributes(image_meta):
-    IMAGE_ATTRIBUTES = ['size', 'location', 'disk_format',
+    IMAGE_ATTRIBUTES = ['size', 'disk_format',
                         'container_format', 'checksum', 'id',
                         'name', 'created_at', 'updated_at',
                         'deleted_at', 'deleted', 'status',
diff --git a/nova/tests/image/test_glance.py b/nova/tests/image/test_glance.py
index 2ab1897f922..5e9f9d79b7b 100644
--- a/nova/tests/image/test_glance.py
+++ b/nova/tests/image/test_glance.py
@@ -129,7 +129,6 @@ def test_create_with_instance_id(self):
             'size': None,
             'min_disk': None,
             'min_ram': None,
-            'location': None,
             'disk_format': None,
             'container_format': None,
             'checksum': None,
@@ -161,7 +160,6 @@ def test_create_without_instance_id(self):
             'size': None,
             'min_disk': None,
             'min_ram': None,
-            'location': None,
             'disk_format': None,
             'container_format': None,
             'checksum': None,
@@ -311,7 +309,6 @@ def test_detail_marker(self):
                 'size': None,
                 'min_disk': None,
                 'min_ram': None,
-                'location': None,
                 'disk_format': None,
                 'container_format': None,
                 'checksum': None,
@@ -356,7 +353,6 @@ def test_detail_marker_and_limit(self):
                 'size': None,
                 'min_disk': None,
                 'min_ram': None,
-                'location': None,
                 'disk_format': None,
                 'container_format': None,
                 'checksum': None,
@@ -436,7 +432,6 @@ def test_show_passes_through_to_client(self):
             'size': None,
             'min_disk': None,
             'min_ram': None,
-            'location': None,
             'disk_format': None,
             'container_format': None,
             'checksum': None,
@@ -472,7 +467,6 @@ def test_detail_passes_through_to_client(self):
                 'size': None,
                 'min_disk': None,
                 'min_ram': None,
-                'location': None,
                 'disk_format': None,
                 'container_format': None,
                 'checksum': None,