Reverted to straight exports for now