(almost) revert a0f6f6c65ea7af905e560da5a9fdc1ad61b0f895...

...and fix the concurrent request issue, this time, by returning a new request
wrapper from the defaults method