diff --git a/src/libs/3rdparty/cplusplus/Bind.cpp b/src/libs/3rdparty/cplusplus/Bind.cpp
index 89ae4015da7..2da94f4b313 100644
--- a/src/libs/3rdparty/cplusplus/Bind.cpp
+++ b/src/libs/3rdparty/cplusplus/Bind.cpp
@@ -2007,6 +2007,7 @@ bool Bind::visit(FunctionDefinitionAST *ast)
 
     if (fun) {
         setDeclSpecifiers(fun, declSpecifiers);
+        fun->setEndOffset(tokenAt(ast->lastToken() - 1).end());
 
         if (_scope->isClass()) {
             fun->setVisibility(_visibility);
@@ -2028,12 +2029,6 @@ bool Bind::visit(FunctionDefinitionAST *ast)
         Scope *previousScope = switchScope(fun);
         this->statement(ast->function_body);
         (void) switchScope(previousScope);
-
-        if (CompoundStatementAST *c = ast->function_body->asCompoundStatement()) {
-            if (c->symbol) {
-                fun->setEndOffset(c->symbol->endOffset());
-            }
-        }
     }
 
     return false;
diff --git a/src/plugins/cpptools/insertionpointlocator.cpp b/src/plugins/cpptools/insertionpointlocator.cpp
index 3cd40271448..cee3784433c 100644
--- a/src/plugins/cpptools/insertionpointlocator.cpp
+++ b/src/plugins/cpptools/insertionpointlocator.cpp
@@ -548,7 +548,6 @@ static InsertionLocation nextToSurroundingDefinitions(Declaration *declaration,
     return InsertionLocation(definition->fileName(), prefix, suffix, line, column);
 }
 
-/// Currently, we return the end of fileName.cpp
 QList<InsertionLocation> InsertionPointLocator::methodDefinition(
     Declaration *declaration) const
 {