Don't add is_setup_fee in an unrelated PR