Revert "Preparing to move to a standalone bootstrap package"

This reverts commit bfb84d676c0a9fb55f66fe1598e9dab863b05b88.