diff --git a/CHANGELOG.md b/CHANGELOG.md
index bfbe9e708..5928ba176 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -26,7 +26,6 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 ### Fixed
 
- - #2815, Build static executable with GSSAPI support - @wolfgangwalther
  - #3237, Dump media handlers and timezones with --dump-schema - @wolfgangwalther
  - #3323, #3324, Don't hide error on LISTEN channel failure - @steve-chavez
  - #3330, Incorrect admin server `/ready` response on slow schema cache loads - @steve-chavez
diff --git a/nix/libpq.nix b/nix/libpq.nix
index ca9103baf..efe3fb9c7 100644
--- a/nix/libpq.nix
+++ b/nix/libpq.nix
@@ -10,7 +10,6 @@
 , lib
 , openssl
 , zlib
-, libkrb5
 , postgresql
 , pkg-config
 , tzdata
@@ -24,14 +23,13 @@ stdenv.mkDerivation {
     "--without-gssapi"
     "--without-icu"
     "--without-readline"
-    "--with-gssapi"
     "--with-openssl"
     "--with-system-tzdata=${tzdata}/share/zoneinfo"
     "--sysconfdir=/etc/postgresql"
   ];
 
   nativeBuildInputs = [ pkg-config tzdata ];
-  buildInputs = [ libkrb5 openssl zlib ];
+  buildInputs = [ openssl zlib ];
 
   buildFlags = [ "submake-libpq" "submake-libpgport" ];
 
@@ -49,12 +47,6 @@ stdenv.mkDerivation {
     runHook postInstall
   '';
 
-  # To avoid linking errors in the static build with gssapi
-  postInstall = ''
-    substituteInPlace $out/lib/pkgconfig/libpq.pc\
-      --replace "Requires.private:" "Requires.private: krb5-gssapi,"
-  '';
-
   outputs = [ "out" ];
 
   meta = with lib; {
diff --git a/nix/static.nix b/nix/static.nix
index ef6559dd2..94b984792 100644
--- a/nix/static.nix
+++ b/nix/static.nix
@@ -29,19 +29,7 @@ let
           # derivation is built with static libraries anyway.
           libraryPkgconfigDepends = [ pkgsCross.libpq ];
         }).overrideAttrs (_: prevAttrs: {
-          buildInputs = prevAttrs.buildInputs ++ [
-            (pkgsStatic.libkrb5.overrideAttrs (_: prevAttrs: {
-              configureFlags = prevAttrs.configureFlags ++ [
-                "--sysconfdir=/etc"
-                # disable keyutils dependency, to avoid linking errors
-                "--without-keyutils"
-              ];
-
-              postInstall = prevAttrs.postInstall + ''
-                ${pkgsStatic.pkgsBuildHost.removeReferencesTo}/bin/remove-references-to -t $out $out/lib/*.a
-              '';
-            }))
-          ];
+          buildInputs = prevAttrs.buildInputs ++ [ pkgsStatic.openssl ];
         });
       });
     });