Re-enable customParams.

If you're OK re-enabling customParams, that does seem like the cleanest approach for us.