Revert "Forbid self to self maps"

This reverts commit 9b4b44e8e071c0cbaad25de8156c175ee7aa674b.

Apparently it's needed for the cache module.  We'll have a
better fix later