Merge pull request #4112 from manolama/tweaks

Restore the ''import "unsafe'' removed in 36daedf35fd0cc2ad0e5e24d187…