Revert map things

It actually didn't work quite good, so after a discussion with @dbu on IRC last week, we decided to revert most of the things I changed in my previous PRs.