Revert 62494a6..08b08b8

This rolls back to commit 62494a6fe5e7a406e5f64558618175fbf3df9b08.
Reverting revert
Insignificant changes

Had to set up some new software, it fiddled with things in ways that
don’t matter. Ignore this one.