diff --git a/pkg/apiserver/apiserver.go b/pkg/apiserver/apiserver.go
index 2f2f11d6921..c87234edd3a 100644
--- a/pkg/apiserver/apiserver.go
+++ b/pkg/apiserver/apiserver.go
@@ -345,8 +345,7 @@ func parseTimeout(str string) time.Duration {
 		}
 		glog.Errorf("Failed to parse %q: %v", str, err)
 	}
-	// TODO: change back to 30s once #5180 is fixed
-	return 2 * time.Minute
+	return 30 * time.Second
 }
 
 func readBody(req *http.Request) ([]byte, error) {
diff --git a/pkg/apiserver/apiserver_test.go b/pkg/apiserver/apiserver_test.go
index 80b9dc218e1..85c51a1508a 100644
--- a/pkg/apiserver/apiserver_test.go
+++ b/pkg/apiserver/apiserver_test.go
@@ -2145,10 +2145,10 @@ func TestUpdateChecksDecode(t *testing.T) {
 }
 
 func TestParseTimeout(t *testing.T) {
-	if d := parseTimeout(""); d != 2*time.Minute {
+	if d := parseTimeout(""); d != 30*time.Second {
 		t.Errorf("blank timeout produces %v", d)
 	}
-	if d := parseTimeout("not a timeout"); d != 2*time.Minute {
+	if d := parseTimeout("not a timeout"); d != 30*time.Second {
 		t.Errorf("bad timeout produces %v", d)
 	}
 	if d := parseTimeout("10s"); d != 10*time.Second {