Revert "More efficient maph."

This reverts commit c88a7e011bad4ed93ae80a067ef48191ffba47ed.
Merge.