Revert "Roll back bootstrap test"

This reverts commit 5a53ae3fcc47be6292797b171afef323eeae5720.