Redo mass assign

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