remove tunneling workaround