Refs #5807, fix last minute refactor in last commit.