Follow our own Klimtwifi

It has better barriers

Change-Id: Ib92c745856ce613a99d490a53cb68412088ae0ee