This reverts commit 5aa57c28. The source code generated due to this ods change does not compile, as it passes to few arguments to llvm::is_contained.