Revert "new bootstrap"

This reverts commit 2f85cf7ba28b025348e70c94dd253d4a464132d9.