Remove bogus mapping
Merge branch 'hotfix-0.24.x' into hotfix