Post #958019

Looks like all of our CI was failing recently, but recently we made a few small changes (including one revert) that should hopefully fix both Windows and Linux runners on GitHub Actions for now.