Revert "more bootstrap"

This reverts commit ecec8165d62e9f88fb94518b77cd1b58c69578af.