This looks like reverting a commit that @dotta made a while ago. Together with ripping out *completion overwrites*, this makes me think there was some git merging conflict that was resolved in the wrong way.