Revert "Fix test failures that were distracting me"

This reverts commit 87edf9e1d7452bc13e90d538e7114a0d6e25f9c9.