Revert "don't redefine user-defined mappings"

This reverts commit 2fa35fb4949f670f1c137dc26a779f6e0515b330.