switch to real tunnel plugin

Change-Id: I7e39613ed1cd370989a5f2151a675a66eae64441