Manual edit to mapping to work around bug: https://www.pivotaltracker.com/story/show/47368033