refs #6550, fixes #6625