Undoing the flatMap for performance reasons.