[FIX] Try to fix tests by rolling back a change.