Revert change to fix tests, I am too stupid at this time to see the right change