More fool-proof request rewriting.