Update bootstrap

Reverts #1844.  Opening this as a separate PR to avoid any regressions given the imminent release.