Revert 2b59edb..82c1a23

This rolls back to commit 2b59edbf3924a2a920e110ca0ef5ad0e5a408ab6.
All variables going through one param