Refs #7225. Reverting change as it doesn't cause/help the issue.