there are a lot of code reviews potentially landable, but i'm going to focus on fixing that CI shard first.