Fixes bug with adding a list of users using add_list_member

This partially reverts b6c1a6 and should be looked at by someone
who understands what's going on there when there's time.
Merge branch 'add-list-member-fix' into mit-prod