TPM: revert the list handling logic fixed in 398a1e7