Florida lawmakers are working on plans to reverse a move that would strip Disney of its right to operate a private government around its theme parks, potentially resolving the fallout from the “Don’t Say Gay” controversy that dragged the entertainment giant into the culture wars.

In April, the Florida legislature voted to dissolve Disney’s 55-year-old special tax district following a public feud between Ron DeSantis, the state’s governor, and then-chief executive Bob Chapek over a new state law restricting discussion of LGBTQ issues in classrooms.

The set-up allows Disney to tax itself to cover the costs of providing water, power, roads and fire services in the area, known as the Reedy Creek Improvement District. The special district is seen as essential for the theme park operator to maintain high standards for visitors.