Merging without changing this, filed https://www.pivotaltracker.com/story/show/62410034 instead.