Revert last commit because it broke some tests