Complete fix for #834.

Permanent fix for #833. 

This shows another regression where a route isn't properly unsetting params.