Revert topic 'handle-only-plain-tll'

It will be replaced by another revision of this fix.
Merge topic 'handle-only-plain-tll' into next

00c442f Revert topic 'handle-only-plain-tll'