Undo most of 8fb4f56c by resynchronising with the new storage interface

Signed-off-by: David Scott <dave.scott@eu.citrix.com>