New mappings to resolve https://www.pivotaltracker.com/story/show/51707691