Revert changes in imports: never use * import style