Yes. The film was shot as you saw it this last time (which matches the play). Test screenings were a disaster, so it was reshot. The first ending was thought lost, but finally recovered, and issued as a director's cut.

Don't feel bad: I've seen Blazing Saddles so many times I've lost count, over 40+ years, and I never caught that the bartender, who likes to keep things "clean," is named Anal Johnson. And I found out from my wife, who hasn't let forget it!