Revert commit f703ae1f (fix to
http://jira.diamond.ac.uk/browse/DAWNSCI-594)