Last commit breaks a bunch of tests (original) (raw)

This commit broke a bunch of our tests: c5f1395.

We should revert it. When reverting locally, tests once again pass.