Respect tenant info from repose

RM7001
Ignoring ordering ofc.