Refs #4077, fix bug in last commit.