partially reverting previous commit for keeping future_data alive