I would also break this line up -- it's really long. Putting the if on the line above will be much more readable. 

I concur with @nielsomat that we probably don't need to offer overriding on a per-request basis. If someone wants it, they can submit a PR, but for now less code is better code.