diff --git a/aws/data_source_aws_ami_ids.go b/aws/data_source_aws_ami_ids.go
index 20df34ac3c5..bce1a70a2b2 100644
--- a/aws/data_source_aws_ami_ids.go
+++ b/aws/data_source_aws_ami_ids.go
@@ -34,7 +34,6 @@ func dataSourceAwsAmiIds() *schema.Resource {
 				ForceNew: true,
 				Elem:     &schema.Schema{Type: schema.TypeString},
 			},
-			"tags": dataSourceTagsSchema(),
 			"ids": &schema.Schema{
 				Type:     schema.TypeList,
 				Computed: true,
diff --git a/aws/data_source_aws_common_schema.go b/aws/data_source_aws_common_schema.go
index 839f8a67bec..bd7fb333347 100644
--- a/aws/data_source_aws_common_schema.go
+++ b/aws/data_source_aws_common_schema.go
@@ -1,37 +1,11 @@
 package aws
 
 import (
-	"bytes"
-	"fmt"
-
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/service/ec2"
-	"github.com/hashicorp/terraform/helper/hashcode"
 	"github.com/hashicorp/terraform/helper/schema"
 )
 
-func dataSourceTagsHash(v interface{}) int {
-	var buf bytes.Buffer
-	m := v.(map[string]interface{})
-	buf.WriteString(fmt.Sprintf("%s-", m["key"].(string)))
-	buf.WriteString(fmt.Sprintf("%s-", m["value"].(string)))
-	return hashcode.String(buf.String())
-}
-
-func dataSourceTags(m []*ec2.Tag) *schema.Set {
-	s := &schema.Set{
-		F: dataSourceTagsHash,
-	}
-	for _, v := range m {
-		tag := map[string]interface{}{
-			"key":   *v.Key,
-			"value": *v.Value,
-		}
-		s.Add(tag)
-	}
-	return s
-}
-
 func buildAwsDataSourceFilters(set *schema.Set) []*ec2.Filter {
 	var filters []*ec2.Filter
 	for _, v := range set.List() {
@@ -69,23 +43,3 @@ func dataSourceFiltersSchema() *schema.Schema {
 		},
 	}
 }
-
-func dataSourceTagsSchema() *schema.Schema {
-	return &schema.Schema{
-		Type:     schema.TypeSet,
-		Computed: true,
-		Set:      dataSourceTagsHash,
-		Elem: &schema.Resource{
-			Schema: map[string]*schema.Schema{
-				"key": {
-					Type:     schema.TypeString,
-					Computed: true,
-				},
-				"value": {
-					Type:     schema.TypeString,
-					Computed: true,
-				},
-			},
-		},
-	}
-}
diff --git a/aws/data_source_aws_ebs_snapshot_ids.go b/aws/data_source_aws_ebs_snapshot_ids.go
index bd4f2ad8bee..17714acb6ca 100644
--- a/aws/data_source_aws_ebs_snapshot_ids.go
+++ b/aws/data_source_aws_ebs_snapshot_ids.go
@@ -26,7 +26,6 @@ func dataSourceAwsEbsSnapshotIds() *schema.Resource {
 				ForceNew: true,
 				Elem:     &schema.Schema{Type: schema.TypeString},
 			},
-			"tags": dataSourceTagsSchema(),
 			"ids": &schema.Schema{
 				Type:     schema.TypeList,
 				Computed: true,