Merge "Revert "Faster sniffing for MIDIExtractor""