Revert "track bootstrap master"

This reverts commit 77e0cee1d317f4896b358efa82b8d2900ffceb61.

Clearly there's more work to do here.