Had to revert a totally unrelated PR. Need to see what blew up, haven't gotten around to that. I was just trying to revert PRs to check what works, and caught this.