Revert "Merge pull request #135 from erikvold/bootstrap-update"

This reverts commit 9d5e43eb1d972db36e66a8a9e82ce1dfa1ea4cfd, reversing
changes made to fef6a593ff78648c335e0bdf6fc726ca2c74c9c5.