In particular note that `users.user_id` is removed by this patch.