diff --git a/brp-python-bytecompile b/brp-python-bytecompile
index 7e20608..ce73856 100644
--- a/brp-python-bytecompile
+++ b/brp-python-bytecompile
@@ -16,31 +16,16 @@ if [ -z "$RPM_BUILD_ROOT" -o "$RPM_BUILD_ROOT" = "/" ]; then
 	exit 0
 fi
 
-# Figure out how deep we need to descend.  We could pick an insanely high
-# number and hope it's enough, but somewhere, somebody's sure to run into it.
-depth=`(find "$RPM_BUILD_ROOT" -type f -name "*.py" -print0 ; echo /) | \
-       xargs -0 -n 1 dirname | sed 's,[^/],,g' | sort -u | tail -n 1 | wc -c`
-if [ -z "$depth" -o "$depth" -le "1" ]; then
-	exit 0
-fi
-
 # This function now implements Python byte-compilation in three different ways:
 # Python >= 3.4 and < 3.9 uses a new module compileall2 - https://github.com/fedora-python/compileall2
 # In Python >= 3.9, compileall2 was merged back to standard library (compileall) so we can use it directly again.
 # Python < 3.4 (inc. Python 2) uses compileall module from stdlib with some hacks
-
-# When we drop support for Python 2, we'd be able to use all compileall2 features like:
-# - -s and -p options to manipulate with a path baked into pyc files instead of $real_libdir
-# - removed useless $depth - both compileall and compileall2 are limited by sys.getrecursionlimit()
-# These changes will make this script much simpler
 function python_bytecompile()
 {
     local options=$1
     local python_binary=$2
     local exclude=$3
     local python_libdir="$4"
-    local depth=$5 # Not used for Python >= 3.4
-    local real_libdir=$6 # Not used for Python >= 3.4
 
     python_version=$($python_binary -c "import sys; sys.stdout.write('{0.major}{0.minor}'.format(sys.version_info))")
 
@@ -80,11 +65,13 @@ function python_bytecompile()
 # Python 3.3 and lower (incl. Python 2)
 #
 
+local real_libdir=${python_libdir/$RPM_BUILD_ROOT/}
+
 cat << EOF | $python_binary $options
 import compileall, sys, os, re
 
 python_libdir = "$python_libdir"
-depth = $depth
+depth = sys.getrecursionlimit()
 real_libdir = "$real_libdir"
 build_root = "$RPM_BUILD_ROOT"
 exclude = r"$exclude"
@@ -123,11 +110,10 @@ shopt -s nullglob
 find "$RPM_BUILD_ROOT" -type d -print0|grep -z -E "/(usr|app)/lib(64)?/python[0-9]\.[0-9]+$" | while read -d "" python_libdir;
 do
 	python_binary=$(basename "$python_libdir")
-	real_libdir=${python_libdir/$RPM_BUILD_ROOT/}
 	echo "Bytecompiling .py files below $python_libdir using $python_binary"
 
 	# Generate normal (.pyc) byte-compiled files.
-	python_bytecompile "" "$python_binary" "" "$python_libdir" "$depth" "$real_libdir"
+	python_bytecompile "" "$python_binary" "" "$python_libdir"
 	if [ $? -ne 0 -a 0$errors_terminate -ne 0 ]; then
 		# One or more of the files had a syntax error
 		exit 1
@@ -135,7 +121,7 @@ do
 
 	# Generate optimized (.pyo) byte-compiled files.
 	# N.B. For Python 3.4+, this call does nothing
-	python_bytecompile "-O" "$python_binary" "" "$python_libdir" "$depth" "$real_libdir"
+	python_bytecompile "-O" "$python_binary" "" "$python_libdir"
 	if [ $? -ne 0 -a 0$errors_terminate -ne 0 ]; then
 		# One or more of the files had a syntax error
 		exit 1