Work around ROOT-6347