Removing an extremely problematic bug