Fix TB4 backwards compatibility

Change-Id: Ib38ccbf9a890c2ebd726dd12708f4a213dc392e2