Merge "No need to initialize the file sniffers anymore"