Revert "Revert "Remove bootstrap""

This reverts commit 8d88580a3209ac32942cb78aa16c971f8a960529.