- Rework fix for MC-114618 so not break map maker's workflow. Fixes #2221