Merge screwed up in the previous commit.