Revert "new bootstrap"

This reverts commit 183d14eb657becea7c79e96e6dffdf286e0284aa.