Revert "Fix failing tests."

This reverts commit 63b28812a715d5020f58c8a396d2ee8f0d49502f.