Attempt to fix bad merge. Refs #9084.