Remove special "_river" handling