Revert nested hash indifference, swap delete order

Upstream doesnt support nested hashes having indifferent access, we
should stay consistent. Swap order for returned value in session hash.