Merge branch '2023-03-14-revert-two-TI-patches' into next
Per request of the author, these two patches weren't quite ready to be applied yet, so revert them.
Per request of the author, these two patches weren't quite ready to be applied yet, so revert them.