Removing dependency to Combinable annotation.