Bug fix: Laggy map
Revert "Bug fix: Laggy map"

This reverts commit 2a244bc7e07a8d84bc16e7e80f0b0b72136a6b80.