Fix fallout from last commit