diff --git a/openstack/storage/v1/containers/requests.go b/openstack/storage/v1/containers/requests.go
index 2aa263a..d7ab2ba 100644
--- a/openstack/storage/v1/containers/requests.go
+++ b/openstack/storage/v1/containers/requests.go
@@ -56,10 +56,13 @@
 		return p
 	}
 
-	url := getAccountURL(c) + query
-	pager := pagination.NewPager(c, url, createPage)
-	pager.Headers = headers
-	return pager
+	url := accountURL(c) + query
+	resp, err := perigee.Request("GET", url, perigee.Options{
+		MoreHeaders: h,
+		Accept:      contentType,
+		OkCodes:     []int{200, 204},
+	})
+	return &resp.HttpResponse, err
 }
 
 // Create is a function that creates a new container.
@@ -76,7 +79,7 @@
 		h["X-Container-Meta-"+k] = v
 	}
 
-	url := getContainerURL(c, opts.Name)
+	url := containerURL(c, opts.Name)
 	_, err := perigee.Request("PUT", url, perigee.Options{
 		MoreHeaders: h,
 		OkCodes:     []int{201, 204},
@@ -95,7 +98,7 @@
 
 	query := utils.BuildQuery(opts.Params)
 
-	url := getContainerURL(c, opts.Name) + query
+	url := containerURL(c, opts.Name) + query
 	_, err := perigee.Request("DELETE", url, perigee.Options{
 		MoreHeaders: h,
 		OkCodes:     []int{204},
@@ -115,7 +118,7 @@
 		h["X-Container-Meta-"+k] = v
 	}
 
-	url := getContainerURL(c, opts.Name)
+	url := containerURL(c, opts.Name)
 	_, err := perigee.Request("POST", url, perigee.Options{
 		MoreHeaders: h,
 		OkCodes:     []int{204},
@@ -132,7 +135,7 @@
 		h["X-Container-Meta-"+k] = v
 	}
 
-	url := getContainerURL(c, opts.Name)
+	url := containerURL(c, opts.Name)
 	resp, err := perigee.Request("HEAD", url, perigee.Options{
 		MoreHeaders: h,
 		OkCodes:     []int{204},
diff --git a/openstack/storage/v1/containers/urls.go b/openstack/storage/v1/containers/urls.go
index 4084bcc..2a06f95 100644
--- a/openstack/storage/v1/containers/urls.go
+++ b/openstack/storage/v1/containers/urls.go
@@ -2,12 +2,12 @@
 
 import "github.com/rackspace/gophercloud"
 
-// getAccountURL returns the URI used to list Containers.
-func getAccountURL(c *gophercloud.ServiceClient) string {
+// accountURL returns the URI used to list Containers.
+func accountURL(c *gophercloud.ServiceClient) string {
 	return c.Endpoint
 }
 
-// getContainerURL returns the URI for making Container requests.
-func getContainerURL(c *gophercloud.ServiceClient, container string) string {
+// containerURL returns the URI for making Container requests.
+func containerURL(c *gophercloud.ServiceClient, container string) string {
 	return c.ServiceURL(container)
 }
