Refs #6777. Fixing persistance of state issue.