Revert "Merge #188995: bundler: 2.3.20 -> 2.3.21"
Revert "Merge #188995: bundler: 2.3.20 -> 2.3.21"

Moving to staging branch, as it's a huge rebuild.

This reverts commit 6511d3fe52c344b4b1d0a688ff53a760a05dda6f, reversing
changes made to cf40140a53bf1920bb71473a0e51730512f83951.

NixOS/nixpkgs,NixOS/nixpkgs,NixOS/nixpkgs,NixOS/nixpkgs,NixOS/nixpkgs,NixOS/nixpkgs,NixOS/nixpkgs,NixOS/nixpkgs,NixOS/nixpkgs,NixOS/nixpkgs,NixOS/nixpkgs,NixOS/nixpkgs,NixOS/nixpkgs,NixOS/nixpkgs,NixOS/nixpkgs