A short but tense distribution dispute between Disney and DirecTV came to an end Saturday after the two sides agreed to a new deal that will restore Disney-owned channels, including ABC, ESPN and FX,

With everything going on at DirecTV, Disney and the industry at large, this is clearly not just any old carriage dispute.

Disney and DirecTV’s spat began on September 1st, when negotiations between the two for a new carriage deal broke down, and Disney pulled all of its programming. Disney had a similar, 12-day dispute with Charter this time last year, blocking its channels for Spectrum subscribers in the middle of the US Open.