Our existing remappings code didn't work when an MBQL fields clause is
present. Typically that fields clause is populated by the
`add-implicit` middleware, but that doesn't happens with the user
included fields.

Fixes #8270