Revert "Safely call map"

This reverts commit 18fa9cba921432d784fc0dab7b6382dae311cd6d.