Bastien Nocera authored May 20, 2008 and Daniel Drake committed May 22, 2008

Last FromStorage variant killed, we need to make sure all
the functions now use the storage functions internally,
otherwise we won't be able to load from the place we save.