Remove duplicate import
Now we should be able to preserve quoted parameters