Revert "Bootstrap on"

This reverts commit ecaa68594cf4ddf3cbcf038c14d837714b5e46e7.
Bootstrap on now

This reverts commit 012b7ea7a5ed00577912c2126c4ece79490a8e85.