Fix import.
Merge pull request #4034 from HassenRiahi/FixImport

Fix import.