Merge "Don't configure parser-factory-callback"