Revert "Create dev-bootstrap branch"

This reverts commit d96ff6521006ef456bffc6e759cf216ee1f18c42.