d77c65b515
This only really affects the initial request, subsequent requests may still use the package name.
(cherry picked from commit 9920ff617b)