Re-enabled the fix, now tests should run just fine.