Default to 3 stage bootstrap

I think this should go in ... but it will have implications for our automated builds on Jenkins.

I can fix that after this lands though.