This keeps 3.12 from 876379f883 but reverts 3.11 to avoid the rebuilds: 8933 x86_64-darwin 21912 x86_64-linux
876379f883