with ROOT-4979 fixed, remove a workaround