Remove promote_for_add to make this much faster