[Finishes #76105916]

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