Not making master branch manual bootstrap, leaving this separate as a part of the isolated branch for demo work.
This reverts commit 003457cd59b804ab1d1ff11341646ff76c46158f, reversing
changes made to 67a6c1fac2e17233a52359496a3cefa8ad6f3607.