Remove special handling of -v