TS: Merge away prematurely merged commits.

Effectively reverts:
    ("EG: extracted..." / 537399) up to and including ("EG: Vet" / 9521a6)