Refs #4041, fix regression in last commit.