Revert "tuna: we do not need this anymore"

This reverts commit b1902345b798ec89ec646ff0cf11c3cc0627981c.

Change-Id: If2485f50b71565521c6348def8883f7411c3a3da