Expored alternative fix to http://jira.diamond.ac.uk/browse/SCI-864 but
not entirely happy with it. Work may prove useful in future.