order address session issue
Revert "order address session issue"

This reverts commit 50ea3aa460259d09aa4f1ef496b7800c9f99db66.