Revert "Combined Categories because jenkins exclude failed"

This reverts commit e4bf5a679f6d38e22062e29897c092a3248afe6e.