Collapsing duplicate code promoted in previous commit.