Routing error after [6959]

Could someone take a look at http://dev.rubyonrails.org/ticket/8601?
The last changeset broke form_for(@model) for a simple edit action.