I think we no longer need to support the first one - we can just keep the second import. The first one was only present in the 0.1 release which was not really a public release.