Revert "Merge pull request #822 from ochameau/deprecate-mapping" for ModuleNotFoundError

This reverts commit 66098bc6923ee78d6d73d68aa8d80a4dc341494a, reversing
changes made to 2bdf0b9efeabd237ab099915aab15a2392059916.