[master] Revert "[master] Crashes everything!!"

This reverts commit c452cc113041d713210c85242689b8d1847e6413.
[master] Mapping error?