Revert "Merge branch 'master' of https://github.com/NoesisEnergy/bootstrap"

This reverts commit b3b890df5556eae80e558beae7515282db48288e, reversing
changes made to d63c8c0587a71b0b8fd73459bbd04b19e5a7de86.