Revert "v0.0.3 with cdietrich's changes on classifier support"

This reverts commit 26c2090d46c97e9e21b7bb8bbc8ee4b57163ee9a.