diff --git a/doc/guix.texi b/doc/guix.texi
index d6dda9904c..527f9bcd10 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -5361,10 +5361,6 @@ more.  To ensure that libraries written in those languages can find
 library code they depend on at run time, run-time dependencies must be
 listed in @code{propagated-inputs} rather than @code{inputs}.
 
-@item @code{self-native-input?} (default: @code{#f})
-This is a Boolean field telling whether the package should use itself as
-a native input when cross-compiling.
-
 @item @code{outputs} (default: @code{'("out")})
 The list of output names of the package.  @xref{Packages with Multiple
 Outputs}, for typical uses of additional outputs.
diff --git a/guix/packages.scm b/guix/packages.scm
index b402637508..1d3d99ba65 100644
--- a/guix/packages.scm
+++ b/guix/packages.scm
@@ -264,9 +264,6 @@ name of its URI."
                      (default '()) (thunked))
   (native-inputs package-native-inputs    ; native input packages/derivations
                  (default '()) (thunked))
-  (self-native-input? package-self-native-input?  ; whether to use itself as
-                                                  ; a native input when cross-
-                      (default #f))               ; compiling
 
   (outputs package-outputs                ; list of strings
            (default '("out")))
@@ -1032,7 +1029,7 @@ and return it."
               ((and self
                     ($ <package> name version source build-system
                                  args inputs propagated-inputs native-inputs
-                                 self-native-input? outputs))
+                                 outputs))
                ;; Even though we prefer to use "@" to separate the package
                ;; name from the package version in various user-facing parts
                ;; of Guix, checkStoreName (in nix/libstore/store-api.cc)
@@ -1044,11 +1041,7 @@ and return it."
                              #:inputs (append (inputs self)
                                               (propagated-inputs self))
                              #:outputs outputs
-                             #:native-inputs `(,@(if (and target
-                                                          self-native-input?)
-                                                     `(("self" ,self))
-                                                     '())
-                                               ,@(native-inputs self))
+                             #:native-inputs (native-inputs self)
                              #:arguments (args self))
                    (raise (if target
                               (condition