*** 321,331 ****
  i_substitute_tokens(const char *sbuf, char *dbuf, int dbuf_size,
      const char *zonename, const char *zonepath, const char *username,
      const char *curr_zone)
  {
          int dst, src;
-         static char *env_pool = NULL;
  
          /*
           * Walk through the characters, substituting values as needed.
           */
          dbuf[0] = '\0';
--- 321,330 ----
*** 338,354 ****
  
                  switch (sbuf[++src]) {
                  case '%':
                          dst += strlcpy(dbuf + dst, "%", dbuf_size - dst);
                          break;
-                 case 'P':
-                         if (env_pool == NULL)
-                                 env_pool = getenv("_ZONEADMD_ZPOOL");
-                         if (env_pool == NULL)
-                                 break;
-                         dst += strlcpy(dbuf + dst, env_pool, dbuf_size - dst);
-                         break;
                  case 'R':
                          if (zonepath == NULL)
                                  break;
                          dst += strlcpy(dbuf + dst, zonepath, dbuf_size - dst);
                          break;
--- 337,346 ----