Follow our own tsubaas

Change-Id: Ib2f9152dd5a0bf82f0ec79d0824665c3cd8aef10