We're still using it in `where_unscoping`, which will require moving
additional logic.