Revert "map again again and again"

This reverts commit add4947fbe5aa9414dbbe7b09e6cc5bc6136785b.