[map][xs]: revert last change from @harrywood as somehow leads to brokenness.