Patches to change per_user to size.