Mapping is wrong, this was the best solution we came up with
Merge pull request #336 from terwey/CS-4738

Mapping is wrong, this was the best solution we came up with