Revert "Typo fixes"

This reverts commit 261a01483e236e7fc7c81c4df7c4c14ab9e9b9b7.
Revert "Bootstrap changes"

This reverts commit 43ba616f910808d90b40f799bcad1b9edd325a0b.