Moved bootstrap back to Flint to reduce dependency