concurrent.ops.future moved, migrating naive strategy.

Cherry-picking 2a6be4f