Re #7770 fix old import