Proper fix for deadlock issue

This is a bit of a hack, but the map engine won't be frozen in place
during a spinlock anymore.