Restore Image as the default container type, with ImageBuffer underneath