query class first version
Revert "query class first version"

This reverts commit 38060e6389d851018b7eca59acbb27b00f333b0b.