Fix https://www.pivotaltracker.com/story/show/77982108