go/build: clean up after rollback

R=rsc
CC=golang-dev
https://golang.org/cl/7237049

src/pkg/go/build/build.go

@@ -321,13 +321,7 @@ func (p *Package) IsCommand() bool {
 // ImportDir is like Import but processes the Go package found in
 // the named directory.
 func (ctxt *Context) ImportDir(dir string, mode ImportMode) (*Package, error) {
-	p, err := ctxt.Import(".", dir, mode)
-	// TODO(rsc,adg): breaks godoc net/http. Not sure why.
-	// See CL 7232047 and issue 4696.
-	if false && err == nil && !ctxt.isDir(p.Dir) {
-		err = fmt.Errorf("%q is not a directory", p.Dir)
-	}
-	return p, err
+	return ctxt.Import(".", dir, mode)
 }
 
 // NoGoError is the error used by Import to describe a directory

src/pkg/go/build/build_test.go

@@ -5,7 +5,6 @@
 package build
 
 import (
-	"fmt"
 	"os"
 	"path/filepath"
 	"runtime"
@@ -90,17 +89,6 @@ func TestLocalDirectory(t *testing.T) {
 	}
 }
 
-// golang.org/issue/3248
-func TestBogusDirectory(t *testing.T) {
-	return // See issue 4696.
-	const dir = "/foo/bar/baz/gopher"
-	_, err := ImportDir(dir, FindOnly)
-	want := fmt.Sprintf("%q is not a directory", filepath.FromSlash(dir))
-	if err == nil || err.Error() != want {
-		t.Errorf("got error %q, want %q", err, want)
-	}
-}
-
 func TestShouldBuild(t *testing.T) {
 	const file1 = "// +build tag1\n\n" +
 		"package main\n"