Revert flat_map to flatten.map for 1.8.7 compatibility