revert #1873 (#1897)

We need access to `rule.Name()` as well as `rule.Kind()` in mapped
resolver.
5 files changed