People with disabilities will no longer go straight to the front of queues at Disneyland and Walt Disney World after growing abuse of the system.
Under the change, visitors will be issued tickets with a return time and a shorter wait similar to the FastPass system that's offered to everyone.
Currently, visitors unable to wait in the regular line can get backdoor access to rides or go through the exit and wait in a shorter line.
The system "certainly has been problematic, and we wanted to curb some of the abuse of this system," Disneyland Resort spokeswoman Suzi Brown told the Orange County Register.
The move is a response to the phenomenon of disabled "tour guides" who charge money, sometimes hundreds of dollars, to accompany able-bodied guests and allow them to avoid long lines.
Others who don't have a disability have been able to get an assistance card because no proof of disability is required.
"Given the increasing volume of requests we receive for special access to our attractions, we are changing our process to create a more consistent experience for all our guests while providing accommodations for guests with disabilities," Brown said.
Some families of children with epilepsy and autism have criticised the change, saying some kids' disabilities just don't allow them to wait in standard lines.
Rebecca Goddard said she takes her sons, aged 4 and 6, to Disneyland once a week. They have autism and can't stand in lines longer than a few minutes before they start pushing other people.
"My boys don't have the cognition to understand why it's going to be a long wait," Goddard told the Register.
"There are so few things for my boys that bring them utter joy and happiness - to mess with it just makes me sad."