Revert "flow: Split flow_extract"