Revert "go back to mainline bootstrap"

This reverts commit 3342150a2c05bd55380819b4fb54724643913720.