Default to the old behaviour