Fix builds

I forgot to re-add appending env vars when merging conflicts.