Partial tunnel update, commit due to upstream bug.