Refs #8571 wrong changes in merge