Refs #7225. Reverting change as it doesn't cause/help the issue.
Merge branch 'bugfix/7225_sp_pickmode_issue' into develop