am 258d2221: Fix build, previous commit failed to remove an import

* commit '258d222152a410341ddad045ce92e57dd7ab454e':
  Fix build, previous commit failed to remove an import