diff --git a/.github/workflows/ci-v2.yaml b/.github/workflows/ci-v2.yaml
index 0755476d..f76cd08f 100644
--- a/.github/workflows/ci-v2.yaml
+++ b/.github/workflows/ci-v2.yaml
@@ -39,7 +39,7 @@ jobs:
         GO111MODULE: on
       run: |
         go get .
-        gcloud components install app-engine-python app-engine-go cloud-datastore-emulator --quiet
+        gcloud components install app-engine-python app-engine-go cloud-datastore-emulator app-engine-python-extras --quiet
     - name: Test gomod v2
       env:
         GO111MODULE: on
@@ -84,7 +84,7 @@ jobs:
       run: |
         go get -u -v $(go list -f '{{join .Imports "\n"}}{{"\n"}}{{join .TestImports "\n"}}' ./... | sort | uniq | grep -v appengine)
         go get -u google.golang.org/appengine/v2
-        gcloud components install app-engine-python app-engine-go cloud-datastore-emulator --quiet
+        gcloud components install app-engine-python app-engine-go cloud-datastore-emulator app-engine-python-extras --quiet
     - name: Test gopath v2
       working-directory: ${{env.working-directory}}
       run: |
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 296eafe6..a87d23a7 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -36,7 +36,7 @@ jobs:
         GO111MODULE: on
       run: |
         go get .
-        gcloud components install app-engine-python app-engine-go cloud-datastore-emulator --quiet
+        gcloud components install app-engine-python app-engine-go cloud-datastore-emulator app-engine-python-extras --quiet
     - name: Test gomod
       env:
         GO111MODULE: on
@@ -77,7 +77,7 @@ jobs:
       run: |
         go get -u -v $(go list -f '{{join .Imports "\n"}}{{"\n"}}{{join .TestImports "\n"}}' ./... | sort | uniq | grep -v appengine)
         go get -u google.golang.org/appengine
-        gcloud components install app-engine-python app-engine-go cloud-datastore-emulator --quiet
+        gcloud components install app-engine-python app-engine-go cloud-datastore-emulator app-engine-python-extras --quiet
     - name: Test gopath
       run: |
         export APPENGINE_DEV_APPSERVER=$(which dev_appserver.py)
diff --git a/appengine_vm.go b/appengine_vm.go
index f4b645aa..4893e52c 100644
--- a/appengine_vm.go
+++ b/appengine_vm.go
@@ -13,8 +13,6 @@ import (
 )
 
 // BackgroundContext returns a context not associated with a request.
-// This should only be used when not servicing a request.
-// This only works in App Engine "flexible environment".
 func BackgroundContext() context.Context {
 	return internal.BackgroundContext()
 }
diff --git a/v2/appengine.go b/v2/appengine.go
index 58a52c19..b2ab1aa7 100644
--- a/v2/appengine.go
+++ b/v2/appengine.go
@@ -135,8 +135,6 @@ func APICall(ctx context.Context, service, method string, in, out proto.Message)
 }
 
 // BackgroundContext returns a context not associated with a request.
-// This should only be used when not servicing a request.
-// This only works in App Engine "flexible environment".
 func BackgroundContext() context.Context {
 	return internal.BackgroundContext()
 }