Fix the botched merge from the last commit.