Fixed cherry-picked patch tr1 usage.