Don't require mapping if specified in the request

This fixes #4483 and is backwards-compatible with our current behavior.