Merge "Revert extractor changes that were SDK=30 specific"