Reversed a change that was breaking the tests.