Revert "Fix to http://jira.diamond.ac.uk/browse/SCI-1200"

This reverts commit af4321a3c204a826e28bb49fb5d58d55be170e75.