delivers 46217967

Finishing up an old one:
https://www.pivotaltracker.com/story/show/46217967