Use the correct version when bootstrapping. 

Fixes #1276, see the discussion there.

Would be nice if @dcoutts could take a look at this.