Merge the fork's copy of this branch, keeping the corrected version

The remote copy is the first draft of the same change: four env vars instead of
one, and gotcha 9 rewritten with a wrong explanation for the 2.7 GB. Both are
superseded, so every conflict resolves to this side.