Revert "Attempted fix to http://jira.diamond.ac.uk/browse/SCI-1341"

This reverts commit 2001aa9676c0a78f9a2eca861f113bdbc5868da8.
Proper fix for SCI-1341
Cleaned up by replacing check with default value
Replaced erroneous reference to run with scan