This is a pretty big behavior change vs. libtm-old, and upon reflection probably better done early in the 5.8 cycle to find out how deeply users expect the old behavior. This reverts commit f542116cc2.
f542116cc2