Fix comments 80023914

https://www.pivotaltracker.com/story/show/80023914