This is probably ok for now. I think we might be able to remove it from the default bootstrap stuff though.