diff --git a/rs_bindings_from_cc/importer.cc b/rs_bindings_from_cc/importer.cc
index 4c6fa23..df5004a 100644
--- a/rs_bindings_from_cc/importer.cc
+++ b/rs_bindings_from_cc/importer.cc
@@ -763,8 +763,8 @@
   // Qualifiers are handled separately in ConvertQualType().
   std::string type_string = clang::QualType(type, 0).getAsString();
 
-  CRUBIT_ASSIGN_OR_RETURN(auto override_type, GetTypeMapOverride(*type));
-  if (override_type.has_value()) {
+  if (auto override_type = GetTypeMapOverride(*type);
+      override_type.has_value()) {
     return *std::move(override_type);
   } else if (type->isPointerType() || type->isLValueReferenceType() ||
              type->isRValueReferenceType()) {