Remove old override hack