This reverts commit ab974161. This change broke several tests, and the pre-commit bot even warning me that it would. Doh!