Revert "Made it more independent of query"
Revert "Made it more independent of query"

This reverts commit ec2855872b0ae64d9c07116d7a1f1aa1b0fdb61a.

mozilla/tabzilla,johngruen/tabzilla,sandrapersing/tabzilla,sandrapersing/tabzilla,johngruen/tabzilla,mozilla/tabzilla