Set up the bootstrap framework - part 2
Revert "Set up the bootstrap framework - part 2"

This reverts commit 1ad98046d093a9cd4c245158ecb1fa65ad735b6b.