MDL-21432 restore & import - disabled until ready