Revert "issues in boootstrap"

This reverts commit 8cd32cd2f437468a3f30d2594d42972dbce8404e.