Remove tunnel identifier stuff (probably blocks testing on SauceLabs)