Temporarily (for 0.9.1) revert "Merge pull request #111 from thedax/master"

Will put it back after 0.9.1, and then later this will be mappable anyway.

This reverts commit 81da5fa32adbb60eb810bec628599a8a513b119a, reversing
changes made to a242bcdd3af3e16f03ad274a91e45c0ed4c87fea.