Simplify import (fix #600)

1 job for improve-import in 2 minutes and 32 seconds
Status Name Job ID Coverage
  Test
passed tests #21946

00:02:32