diff --git a/concourse/tasks/gem-test/gem-build.sh b/concourse/tasks/gem-test/gem-build.sh
index 76db3ce2e0..2647c1fa0a 100755
--- a/concourse/tasks/gem-test/gem-build.sh
+++ b/concourse/tasks/gem-test/gem-build.sh
@@ -27,6 +27,12 @@ cp -f ../ci/tasks/set-version-to-timestamp.rb tasks/set-version-to-timestamp.rb
 bundle exec rake -f tasks/set-version-to-timestamp.rb set-version-to-timestamp
 
 if [ -n "${BUILD_NATIVE_GEM:-}" ] ; then
+  # TODO remove after https://github.com/rake-compiler/rake-compiler/pull/171 is shipped
+  find /usr/local/rvm/gems -name extensiontask.rb | while read f ; do
+    echo "rewriting $f"
+    sudo sed -i 's/callback.call(spec) if callback/@cross_compiling.call(spec) if @cross_compiling/' $f
+  done
+
   bundle exec rake gem:x86_64-linux:guest
 else
   # TODO we're only compiling so that we retrieve libxml2/libxslt
diff --git a/tasks/cross-ruby.rb b/tasks/cross-ruby.rb
index 1f82c1e03a..35c098f47e 100644
--- a/tasks/cross-ruby.rb
+++ b/tasks/cross-ruby.rb
@@ -165,6 +165,7 @@ def verify_dll(dll, cross_ruby)
 
     desc "build native gem for #{plat} platform\nthis trampolines into the rake-compiler-dock guest"
     task plat do
+      # TODO remove `find` after https://github.com/rake-compiler/rake-compiler/pull/171 is shipped
       RakeCompilerDock.sh <<-EOT, platform: plat
         gem install bundler --no-document &&
         bundle &&