Revert "Fix to http://jira.diamond.ac.uk/browse/DAWNSCI-639"

This reverts commit 5da01adace22bbba8f6a80d95a3705025e37d578.