Use remove_ordering_args() to remove order query filters instead of remove_product_query(). Most likely was a merge issue. Fixes #4142