diff --git a/dashboard/builders.go b/dashboard/builders.go
index 447c471..54ce500 100644
--- a/dashboard/builders.go
+++ b/dashboard/builders.go
@@ -1443,7 +1443,7 @@
 		Name:     "freebsd-386-10_3",
 		HostType: "host-freebsd-10_3",
 		buildsRepo: func(repo, branch, goBranch string) bool {
-			return goBranch == "release-branch.go1.12"
+			return goBranch == "release-branch.go1.12" && defaultBuildsRepoPolicy(repo, branch, goBranch)
 		},
 		env: []string{"GOARCH=386", "GOHOSTARCH=386"},
 	})
@@ -1451,7 +1451,7 @@
 		Name:     "freebsd-386-10_4",
 		HostType: "host-freebsd-10_4",
 		buildsRepo: func(repo, branch, goBranch string) bool {
-			return goBranch == "release-branch.go1.12"
+			return goBranch == "release-branch.go1.12" && defaultBuildsRepoPolicy(repo, branch, goBranch)
 		},
 		env: []string{"GOARCH=386", "GOHOSTARCH=386"},
 	})
@@ -1460,7 +1460,7 @@
 		HostType:          "host-freebsd-11_1",
 		shouldRunDistTest: noTestDir,
 		buildsRepo: func(repo, branch, goBranch string) bool {
-			return goBranch == "release-branch.go1.12"
+			return goBranch == "release-branch.go1.12" && defaultBuildsRepoPolicy(repo, branch, goBranch)
 		},
 		env: []string{"GOARCH=386", "GOHOSTARCH=386"},
 	})
diff --git a/dashboard/builders_test.go b/dashboard/builders_test.go
index 8ea91ec..2bee242 100644
--- a/dashboard/builders_test.go
+++ b/dashboard/builders_test.go
@@ -314,7 +314,7 @@
 		{b("android-amd64-emu@go1.12", "mobile"), none},
 		{b("android-amd64-emu@go1.13", "mobile"), both},
 		{b("android-amd64-emu", "mobile@1.13"), both},
-		{b("freebsd-386-11_1@go1.12", "mobile"), onlyPost}, // TODO(dmitshur, golang.org/issue/36506): accurately refrects current state, but should be changed to none
+		{b("freebsd-386-11_1@go1.12", "mobile"), none}, // This was golang.org/issue/36506.
 
 		{b("android-amd64-emu", "go"), both},
 		{b("android-amd64-emu", "crypto"), both},