Return the old logic.

Refs #7720
Fixed the bug with SmoothNeighbours happening when there are no suitable workspaces.

Refs #7720
Merge remote-tracking branch 'origin/bugfix/7720_gui_prop_use_default'
Merge branch 'master' into feature/7739_work_multibanks
Fixed a bug.  Refs #7739.