Reenable direct addressin for now