Revert "Don't ignore query strings"

This reverts commit 93489b935ec449a9a545ab0ef3f79573ce0699bc.