In preparation of switching to CVS 1.11.12, repair its import: