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

This reverts commit bd01cb1da92ee9f49d60261ae76a0141d0cc1578.
Proper fix for SCI-1341