Revert Plan B workaround - not effective
Merge pull request #158 from rjc123/newmappings

Revert Plan B workaround - not effective