I don't think people should need a 504 as a precondition to use the correct restroom
The segregation exists for social reasons. Forcing a hairy, muscular, transgender man to enter a woman's restroom against his will is an example of foolish government overreach.