Updates: #27145 Revert quote swapping order for tribe prepare for json to working state.