Revert "Fix broken CI. (#12963)"

This reverts commit eb91c664dc0b4d69db09ae913f2d7a5ef3490d74.

bootstraptest/test_fork.rb

@@ -84,7 +84,7 @@ assert_equal 'ok', %q{
 
   10.times do
     pid = fork{ exit!(0) }
-    deadline = now + 30
+    deadline = now + 10
     until Process.waitpid(pid, Process::WNOHANG)
       if now > deadline
         Process.kill(:KILL, pid)

spec/bundler/install/gemfile/git_spec.rb

@@ -1204,7 +1204,7 @@ RSpec.describe "bundle install with git sources" do
         gem "foo", :git => "#{lib_path("foo-1.0")}", :branch => "deadbeef"
       G
 
-      expect(err).to match(/deadbeef (not found in upstream origin|does not exist in the repository)/)
+      expect(err).to include("Revision deadbeef does not exist in the repository")
     end
   end