Partly revert the last commit since it broke the tests.