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

This reverts commit d8c4d8713577298994ce05f51f82f34f3389ccd9.
Attempt to fix test.