Revert to old style imports