Revert "Make some more tests pass"

This reverts commit c2c66fee7f4e16b735246cd5e72d8aeab897daec.