diff --git a/packer.go b/packer.go
index 34cddfd39..afd6873de 100644
--- a/packer.go
+++ b/packer.go
@@ -11,8 +11,6 @@ import (
 )
 
 func main() {
-	log.SetFlags(log.Ldate | log.Ltime | log.Llongfile)
-
 	commands := map[string]string {
 		"build": "packer-build",
 	}
diff --git a/packer/plugin/client.go b/packer/plugin/client.go
index 2bde714c2..0a8564443 100644
--- a/packer/plugin/client.go
+++ b/packer/plugin/client.go
@@ -1,7 +1,6 @@
 package plugin
 
 import (
-	"bufio"
 	"bytes"
 	"errors"
 	"io"
@@ -152,9 +151,7 @@ func (c *client) Kill() {
 	<-done
 }
 
-func (c *client) logStderr(r io.Reader) {
-	buf := bufio.NewReader(r)
-
+func (c *client) logStderr(buf *bytes.Buffer) {
 	for done := false; !done; {
 		if c.Exited() {
 			done = true