Revert "Broken generics in Facet API"

This reverts commit 87dcacd968591aff825aff2949a0dc4a9f125fc8.