Merge "Revert "Change extraction tool to vendor_available""