Fix macOS build failure

[kevinbackhouse]

Builds have started failing on macOS. See for example #1958.

This problem originally only affected Macs with the M1 chip, but I guess it has now spread to the Intel machines too.

This commit reverts #1857, which limited the workaround to just M1 machines. I think we need to go back to applying the workaround to all Macs.

[codecov]

Codecov Report

Merging #1962 (532ed8c) into main (4901c5d) will not change coverage.
The diff coverage is n/a.

❗ Current head 532ed8c differs from pull request most recent head cf6566b. Consider uploading reports for the commit cf6566b to get more accurate results

@@           Coverage Diff           @@
##             main    #1962   +/-   ##
=======================================
  Coverage   61.12%   61.12%           
=======================================
  Files          96       96           
  Lines       19055    19055           
  Branches     9743     9743           
=======================================
  Hits        11647    11647           
  Misses       5092     5092           
  Partials     2316     2316           

---

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 4901c5d...cf6566b. Read the comment docs.

[kmilos]

LGTM

[kevinbackhouse]

@Mergifyio backport 0.27-maintenance

[mergify]

backport 0.27-maintenance

✅ Backports have been created

• #1966 Fix macOS build failure (backport #1962) has been created for branch 0.27-maintenance