avoid-facets

Hey Dante, this is the change that Shuyang mentioned I would be sending. /cc @shuyangzhou @mhan810