Checking in some unused bootstrap opt-in work