Punting this until [PT#60101586](https://www.pivotaltracker.com/story/show/60101586). We should have a comprehensive/consistent solution.