am 4d89e2af: clean up backup imports

* commit '4d89e2af1189ac0bbd37b4f7cf4f160603a2b6e4':
  clean up backup imports