Revert "Tuna: Fix waning"

This reverts commit a89f1084aed454e3ba673cf12059a90eeb19a615.
Tuna: Re-do what I reverted in other way

Change-Id: I9f53f0f59025e16f4911058b269a26df62ebec7e