Revert this change. The tests is fixed already