Revert "Merge pull request #3 from bpow/multimap"

This reverts commit 071043d32191b4bc8a772be3f4ca30dfb2cb6e09, reversing
changes made to 61069091dd7c2eee54a7b3bd58563ddb1ab446ad.

Removing until we can figure out why the number of calls is drastically
reduced.