Reverted my silly changes to the mapping prototype