Completely remove the old fix this time