diff --git a/src/FillPdfAdminFormHelperInterface.php b/src/FillPdfAdminFormHelperInterface.php
index 7a94166c47b3e3ca584bdc74844943623ae05c33..3f001b00ababe12f3826a0069284708027f1ef11 100644
--- a/src/FillPdfAdminFormHelperInterface.php
+++ b/src/FillPdfAdminFormHelperInterface.php
@@ -13,7 +13,8 @@ interface FillPdfAdminFormHelperInterface {
    * Returns render array for a link to a token tree shown as a dialog.
    *
    * @param string[]|string $token_types
-   *   (optional) Array of token types. Defaults to 'all'.
+   *   (optional) Array of token types. Defaults to 'all'. Note that it's the
+   *   caller's duty to translate entity types into token types.
    *
    * @return array
    *   Render array.
diff --git a/src/Service/FillPdfAdminFormHelper.php b/src/Service/FillPdfAdminFormHelper.php
index d11f8e21afd14f27d51d464ad1987178f41ef5cf..30d71bf531ffd5d250a863c183cac905db93ca7b 100644
--- a/src/Service/FillPdfAdminFormHelper.php
+++ b/src/Service/FillPdfAdminFormHelper.php
@@ -67,12 +67,6 @@ class FillPdfAdminFormHelper implements FillPdfAdminFormHelperInterface {
    * {@inheritdoc}
    */
   public function getAdminTokenForm($token_types = 'all') {
-    // Special treatment for Core's taxonomy_term and taxonomy_vocabulary.
-    if (is_array($token_types)) {
-      foreach ($token_types as $key => $type) {
-        $token_types[$key] = strtr($type, ['taxonomy_' => '']);
-      }
-    }
     return [
       '#theme' => 'token_tree_link',
       '#token_types' => $token_types,