diff --git a/builder/evaluator.go b/builder/evaluator.go
index 058e08d185..cf79e045f2 100644
--- a/builder/evaluator.go
+++ b/builder/evaluator.go
@@ -144,7 +144,7 @@ func (b *Builder) Run(context io.Reader) (string, error) {
 	b.dockerfile = ast
 
 	// some initializations that would not have been supplied by the caller.
-	b.Config = &runconfig.Config{Entrypoint: []string{}, Cmd: []string{"/bin/sh", "-c"}, Env: []string{"PATH=" + daemon.DefaultPathEnv}}
+	b.Config = &runconfig.Config{Entrypoint: []string{}, Cmd: []string{"/bin/sh", "-c"}}
 	b.TmpContainers = map[string]struct{}{}
 
 	for i, n := range b.dockerfile.Children {
diff --git a/builder/internals.go b/builder/internals.go
index 4f68525cfb..e38818821e 100644
--- a/builder/internals.go
+++ b/builder/internals.go
@@ -90,10 +90,6 @@ func (b *Builder) commit(id string, autoCmd []string, comment string) error {
 	autoConfig := *b.Config
 	autoConfig.Cmd = autoCmd
 
-	if autoConfig.Entrypoint == nil {
-		autoConfig.Entrypoint = []string{"/bin/sh", "-c"}
-	}
-
 	// Commit the container
 	image, err := b.Daemon.Commit(container, "", "", "", b.maintainer, true, &autoConfig)
 	if err != nil {