Revert "Merge pull request #33 from djinn/feature/query_colors"

This reverts commit abff58d7a1499b1a9120fbd992fd25de67e99e50, reversing
changes made to 239875fd669b59fbda2580fc3c3ab86e16f5911f.