Commit for Pivotal story: 82175608