diff --git a/device/linux-google-crosshatch-mainline/APKBUILD b/device/linux-google-crosshatch-mainline/APKBUILD
index 3be86af31..e6cfb83ea 100644
--- a/device/linux-google-crosshatch-mainline/APKBUILD
+++ b/device/linux-google-crosshatch-mainline/APKBUILD
@@ -13,7 +13,7 @@ _kernver=${pkgver%_rc*}
 _mainver=${_kernver%.*}
 _patchlevel=${_kernver/$_mainver./}
 _basever=${_mainver}.$((_patchlevel-1))
-pkgrel=0
+pkgrel=1
 
 arch="aarch64"
 pkgdesc="Google Pixel 3 XL mainline kernel; only USB networking works, nothing else"
@@ -164,28 +164,6 @@ dev() {
 	mkdir -p "$subpkgdir"/lib/modules/${_abi_release}
 	ln -sf /usr/src/linux-headers-${_abi_release} \
 		"$subpkgdir"/lib/modules/${_abi_release}/build
-
-	# cross-compiling: delete binaries with host arch and replace them with
-	# symlinks to binaries with the target arch (packaged in kernel-scripts)
-	if [ -n "$CROSS_COMPILE" ]; then
-		msg "Symlinking binary scripts..."
-		depends="$depends kernel-scripts"
-		local found="false"
-		cd "$dir/scripts"
-		local i
-		for i in $(find . -type f); do
-			local type="$(file -b --mime-type "$i")"
-			[ "$type" != "application/x-pie-executable" ] && continue
-			local native="/usr/bin/kernel-scripts/$(echo "$i" | cut -d '/' -f 2-)"
-			ln -svf "$native" "$i"
-			found="true"
-		done
-		if [ "$found" = "false" ]; then
-			error "Failed to symlink binary scripts!"
-			error "Did the mime-type change (see #1659)?"
-			return 1
-		fi
-	fi
 }
 sha512sums="027d5a16ca9299bc3b5b51c6a6e00295c6a31f1a0f01604482bcfc93f6ce87eaa1623998b560acd4980266deedce320f0a96cf6043905c7da8136925c8900fea  linux-google-crosshatch-mainline-b14ca253ec25cde39c7b07ac3a3542838672fc15.tar.gz
 947d7ca37c57335aae5137a9dc40e983c28ddd7f2bd4ef2ec21feb5d609809a6e96e52a989e1273f466ed8d655f717e84b649a81d0c4309d7d360172faa38e6d  config-google-crosshatch-mainline.aarch64"
diff --git a/main/kernel-scripts/APKBUILD b/main/kernel-scripts/APKBUILD
deleted file mode 100644
index 4f8726653..000000000
--- a/main/kernel-scripts/APKBUILD
+++ /dev/null
@@ -1,78 +0,0 @@
-pkgname=kernel-scripts
-pkgver=4.15.0
-pkgrel=2
-pkgdesc="Binary scripts needed to build kernel packages"
-url="http://kernel.org"
-depends=""
-makedepends="perl gmp-dev elfutils-dev bash sed bc linux-headers file openssl-dev"
-options="!check"
-arch="x86_64 armhf aarch64"
-license="GPL-2.0"
-
-# Sources
-case $pkgver in
-	*.*.*)	_kernver=${pkgver%.*};;
-	*.*) _kernver=$pkgver;;
-esac
-source="https://cdn.kernel.org/pub/linux/kernel/v${pkgver%%.*}.x/linux-$_kernver.tar.xz"
-if [ "${pkgver%.0}" = "$pkgver" ]; then
-	source="$source
-	https://cdn.kernel.org/pub/linux/kernel/v${pkgver%%.*}.x/patch-$pkgver.xz"
-fi
-
-# Arch
-_carch=${CARCH}
-case "$_carch" in
-aarch64*) _carch="arm64" ;;
-arm*) _carch="arm" ;;
-mips*) _carch="mips" ;;
-ppc*) _carch="powerpc" ;;
-s390*) _carch="s390" ;;
-esac
-
-builddir="$srcdir/linux-$_kernver"
-prepare() {
-	cd "$builddir"
-
-	# Apply patch
-	local patch="$srcdir/patch-$pkgver.xz"
-	if [ -e "$patch" ]; then
-		msg "Applying patch-$pkgver.xz"
-		unxz -c < "$srcdir"/patch-$pkgver.xz | patch -p1 -N
-	fi
-}
-
-build() {
-	unset LDFLAGS
-	mkdir -p "$srcdir/build"
-	make -j1 -C "$builddir" O="$srcdir/build" ARCH="$_carch" \
-		HOSTCC="${CC:-gcc}" defconfig scripts
-}
-
-package() {
-	local type_bin="application/x-pie-executable"
-	msg "Finding and installing $type_bin files..."
-
-	local i
-	local found=false
-	cd "$srcdir/build/scripts"
-	for i in $(find . -type f); do
-		local type="$(file -b --mime-type "$i")"
-		if [ "$type" != "$type_bin" ]; then
-			echo "$i: different mime-type ($type)"
-			continue
-		fi
-		echo "$i: matched!"
-		install -Dm755 "$i" "$pkgdir/usr/bin/kernel-scripts/$i"
-		found=true
-	done
-	if [ "$found" = "false" ]; then
-		error "Could not find any binaries! 'file' probably prints out a"
-		error "different mime-type now. This is easy to fix, just figure out"
-		error "the correct one from the output above (look at the"
-		error "./basic/fixdep line for example) then adjust type_bin= in"
-		error "package()."
-		return 1
-	fi
-}
-sha512sums="c00d92659df815a53dcac7dde145b742b1f20867d380c07cb09ddb3295d6ff10f8931b21ef0b09d7156923a3957b39d74d87c883300173b2e20690d2b4ec35ea  linux-4.15.tar.xz"
diff --git a/main/linux-postmarketos-mainline/APKBUILD b/main/linux-postmarketos-mainline/APKBUILD
index d5287601e..84f764f70 100644
--- a/main/linux-postmarketos-mainline/APKBUILD
+++ b/main/linux-postmarketos-mainline/APKBUILD
@@ -9,7 +9,7 @@ _kernver=${pkgver%_rc*}
 _mainver=${_kernver%.*}
 _patchlevel=${_kernver/$_mainver./}
 _basever=${_mainver}.$((_patchlevel-1))
-pkgrel=2
+pkgrel=3
 
 arch="x86_64 armhf aarch64"
 pkgdesc="Linux for pmOS supported chipsets (mainline, more bleeding-edge than stable)"
@@ -159,28 +159,6 @@ dev() {
 	mkdir -p "$subpkgdir"/lib/modules/${_abi_release}
 	ln -sf /usr/src/linux-headers-${_abi_release} \
 		"$subpkgdir"/lib/modules/${_abi_release}/build
-
-	# cross-compiling: delete binaries with host arch and replace them with
-	# symlinks to binaries with the target arch (packaged in kernel-scripts)
-	if [ -n "$CROSS_COMPILE" ]; then
-		msg "Symlinking binary scripts..."
-		depends="$depends kernel-scripts"
-		local found="false"
-		cd "$dir/scripts"
-		local i
-		for i in $(find . -type f); do
-			local type="$(file -b --mime-type "$i")"
-			[ "$type" != "application/x-pie-executable" ] && continue
-			local native="/usr/bin/kernel-scripts/$(echo "$i" | cut -d '/' -f 2-)"
-			ln -svf "$native" "$i"
-			found="true"
-		done
-		if [ "$found" = "false" ]; then
-			error "Failed to symlink binary scripts!"
-			error "Did the mime-type change (see #1659)?"
-			return 1
-		fi
-	fi
 }
 sha512sums="4d9de340a26155a89ea8773131c76220cc2057f2b5d031b467b60e8b14c1842518e2d60a863d8c695f0f7640f3f18d43826201984a238dade857b6cef79837db  linux-4.17.tar.xz
 da3d10fd0206e006e0d4448624cb0d5de61dce1e80dcc5272b088fa7284d360e5bac464a369bbf5d06625fc20d73991ee81f09bb1c8c271eb45646d3ce7927e7  linux-v4.17-v4.18.patch
diff --git a/main/linux-postmarketos-qcom/APKBUILD b/main/linux-postmarketos-qcom/APKBUILD
index 0b38b0c1a..1ceef796f 100644
--- a/main/linux-postmarketos-qcom/APKBUILD
+++ b/main/linux-postmarketos-qcom/APKBUILD
@@ -4,7 +4,7 @@ _config="config-${_flavor}.${CARCH}"
 pkgname=linux-${_flavor}
 
 pkgver=4.17_rc3
-pkgrel=9
+pkgrel=10
 
 arch="armhf armv7"
 pkgdesc="Kernel close to mainline with extra patches for Qualcomm devices"
@@ -160,28 +160,6 @@ dev() {
 	mkdir -p "$subpkgdir"/lib/modules/${_abi_release}
 	ln -sf /usr/src/linux-headers-${_abi_release} \
 		"$subpkgdir"/lib/modules/${_abi_release}/build
-
-	# cross-compiling: delete binaries with host arch and replace them with
-	# symlinks to binaries with the target arch (packaged in kernel-scripts)
-	if [ -n "$CROSS_COMPILE" ]; then
-		msg "Symlinking binary scripts..."
-		depends="$depends kernel-scripts"
-		local found="false"
-		cd "$dir/scripts"
-		local i
-		for i in $(find . -type f); do
-			local type="$(file -b --mime-type "$i")"
-			[ "$type" != "application/x-pie-executable" ] && continue
-			local native="/usr/bin/kernel-scripts/$(echo "$i" | cut -d '/' -f 2-)"
-			ln -svf "$native" "$i"
-			found="true"
-		done
-		if [ "$found" = "false" ]; then
-			error "Failed to symlink binary scripts!"
-			error "Did the mime-type change (see #1659)?"
-			return 1
-		fi
-	fi
 }
 sha512sums="02fd136d24914e30decd207c3b2e0168cc9d6e4a0fc981abf8d537cd95c70583f5239d0dc7f2ae94a2ddd2ba82d822933159167801a035731a24aa1300c5ceec  linux-09efb4857f1a4119eced855912043817bd96e064.tar.gz
 fc151402f33f947fdfb1a0f60f7dee621b2299678c14bbc2d3425c22b3300795cddfba8635f3d2d9a409ea506e825d00957bffe14d54cd14612d364a1d03529a  config-postmarketos-qcom.armhf
diff --git a/main/linux-postmarketos-stable/APKBUILD b/main/linux-postmarketos-stable/APKBUILD
index b59bb2ae0..101c2c888 100644
--- a/main/linux-postmarketos-stable/APKBUILD
+++ b/main/linux-postmarketos-stable/APKBUILD
@@ -9,7 +9,7 @@ case $pkgver in
 	*.*.*)	_kernver=${pkgver%.*};;
 	*.*) _kernver=$pkgver;;
 esac
-pkgrel=2
+pkgrel=3
 
 arch="x86_64 armv7 aarch64"
 pkgdesc="Linux for pmOS supported chipsets (stable)"
@@ -166,28 +166,6 @@ dev() {
 	mkdir -p "$subpkgdir"/lib/modules/${_abi_release}
 	ln -sf /usr/src/linux-headers-${_abi_release} \
 		"$subpkgdir"/lib/modules/${_abi_release}/build
-
-	# cross-compiling: delete binaries with host arch and replace them with
-	# symlinks to binaries with the target arch (packaged in kernel-scripts)
-	if [ -n "$CROSS_COMPILE" ]; then
-		msg "Symlinking binary scripts..."
-		depends="$depends kernel-scripts"
-		local found="false"
-		cd "$dir/scripts"
-		local i
-		for i in $(find . -type f); do
-			local type="$(file -b --mime-type "$i")"
-			[ "$type" != "application/x-pie-executable" ] && continue
-			local native="/usr/bin/kernel-scripts/$(echo "$i" | cut -d '/' -f 2-)"
-			ln -svf "$native" "$i"
-			found="true"
-		done
-		if [ "$found" = "false" ]; then
-			error "Failed to symlink binary scripts!"
-			error "Did the mime-type change (see #1659)?"
-			return 1
-		fi
-	fi
 }
 
 sha512sums="950eb85ac743b291afe9f21cd174d823e25f11883ee62cecfbfff8fe8c5672aae707654b1b8f29a133b1f2e3529e63b9f7fba4c45d6dacccc8000b3a9a9ae038  linux-4.18.tar.xz