diff --git a/info/container.go b/info/container.go
index 325ce47d..a561c200 100644
--- a/info/container.go
+++ b/info/container.go
@@ -72,26 +72,6 @@ type ContainerInfoRequest struct {
 	MemoryUsagePercentages []int `json:"memory_usage_percentiles,omitempty"`
 }
 
-func (self *ContainerInfoRequest) FillDefaults() *ContainerInfoRequest {
-	ret := self
-	if ret == nil {
-		ret = new(ContainerInfoRequest)
-	}
-	if ret.NumStats < 0 {
-		ret.NumStats = 1024
-	}
-	if ret.NumSamples < 0 {
-		ret.NumSamples = 1024
-	}
-	if len(ret.CpuUsagePercentiles) == 0 {
-		ret.CpuUsagePercentiles = []int{50, 80, 90, 99}
-	}
-	if len(ret.MemoryUsagePercentages) == 0 {
-		ret.MemoryUsagePercentages = []int{50, 80, 90, 99}
-	}
-	return ret
-}
-
 type ContainerInfo struct {
 	ContainerReference
 
diff --git a/manager/manager.go b/manager/manager.go
index 1f684f50..1c55ca5e 100644
--- a/manager/manager.go
+++ b/manager/manager.go
@@ -130,7 +130,6 @@ func (m *manager) GetContainerInfo(containerName string, query *info.ContainerIn
 	var percentiles *info.ContainerStatsPercentiles
 	var samples []*info.ContainerStatsSample
 	var stats []*info.ContainerStats
-	query = query.FillDefaults()
 	percentiles, err = m.storageDriver.Percentiles(
 		cinfo.Name,
 		query.CpuUsagePercentiles,
diff --git a/manager/manager_test.go b/manager/manager_test.go
index 590afa6a..5dc429bd 100644
--- a/manager/manager_test.go
+++ b/manager/manager_test.go
@@ -169,8 +169,12 @@ func TestGetContainerInfoWithDefaultValue(t *testing.T) {
 		"/c2",
 	}
 
-	var query *info.ContainerInfoRequest
-	query = query.FillDefaults()
+	query := &info.ContainerInfoRequest{
+		NumStats:               64,
+		NumSamples:             64,
+		CpuUsagePercentiles:    {50, 80, 90},
+		MemoryUsagePercentiles: {50, 80, 90},
+	}
 
 	infosMap := make(map[string]*info.ContainerInfo, len(containers))
 	handlerMap := make(map[string]*container.MockContainerHandler, len(containers))