Undo recursive copy of files (fixes #75530934)
Tweak import statement