Backout previous commit that introduced an as_bootstrap tag.