Upstream commit b0b80f4f02: Fix the setup of the extension