Another missing file after merge from trunk.

test_import now passes