Revert "bootstrap/bootstrap"

This reverts commit 8eb445de4f4f574db1a9efdafcac147be41f5826.