Continue on bootstrap 3
Revert "Continue on bootstrap 3"

This reverts commit e77c000522df3dbd286d82e37c56bb4fe99ca0e7.