Revert "Merge branch 'feature/bootstrap' into dev"

This reverts commit 50928385ca550f2cf754a2612eee9a5fc9f3d1d6, reversing
changes made to 9d1cf0c2d34bd9e3f1a7032c8736b101d9444e67.