diff --git a/src/compiler.cc b/src/compiler.cc
index 5de9d960c7..7b0b921529 100644
--- a/src/compiler.cc
+++ b/src/compiler.cc
@@ -1181,16 +1181,7 @@ void Compiler::RecordFunctionCompilation(Logger::LogEventsAndTags tag,
     Handle<Code> code = info->code();
     if (*code == info->isolate()->builtins()->builtin(Builtins::kLazyCompile))
       return;
-    Handle<String> script_name;
     if (script->name()->IsString()) {
-      script_name = Handle<String>(String::cast(script->name()));
-    } else {
-      Handle<Object> name = GetScriptNameOrSourceURL(script);
-      if (!name.is_null() && name->IsString()) {
-        script_name = Handle<String>::cast(name);
-      }
-    }
-    if (!script_name.is_null()) {
       int line_num = GetScriptLineNumber(script, shared->start_position()) + 1;
       USE(line_num);
       PROFILE(info->isolate(),
@@ -1198,7 +1189,7 @@ void Compiler::RecordFunctionCompilation(Logger::LogEventsAndTags tag,
                               *code,
                               *shared,
                               info,
-                              String::cast(*script_name),
+                              String::cast(script->name()),
                               line_num));
     } else {
       PROFILE(info->isolate(),
diff --git a/src/handles.cc b/src/handles.cc
index 152f8c2531..6859cd423f 100644
--- a/src/handles.cc
+++ b/src/handles.cc
@@ -599,9 +599,6 @@ v8::Handle<v8::Array> GetKeysForIndexedInterceptor(Handle<JSReceiver> receiver,
 
 Handle<Object> GetScriptNameOrSourceURL(Handle<Script> script) {
   Isolate* isolate = script->GetIsolate();
-  if (!isolate->IsInitialized()) {
-    return isolate->factory()->undefined_value();
-  }
   Handle<String> name_or_source_url_key =
       isolate->factory()->InternalizeOneByteString(
           STATIC_ASCII_VECTOR("nameOrSourceURL"));
diff --git a/src/log.cc b/src/log.cc
index 1d545af2c4..908a3682b8 100644
--- a/src/log.cc
+++ b/src/log.cc
@@ -1728,18 +1728,10 @@ void Logger::LogExistingFunction(Handle<SharedFunctionInfo> shared,
   Handle<String> func_name(shared->DebugName());
   if (shared->script()->IsScript()) {
     Handle<Script> script(Script::cast(shared->script()));
-    Handle<String> script_name;
     if (script->name()->IsString()) {
-      script_name = Handle<String>(String::cast(script->name()));
-    } else {
-      Handle<Object> name = GetScriptNameOrSourceURL(script);
-      if (!name.is_null() && name->IsString()) {
-        script_name = Handle<String>::cast(name);
-      }
-    }
-    if (!script_name.is_null()) {
+      Handle<String> script_name(String::cast(script->name()));
       int line_num = GetScriptLineNumber(script, shared->start_position());
-      if (line_num > -1) {
+      if (line_num > 0) {
         PROFILE(isolate_,
                 CodeCreateEvent(
                     Logger::ToNativeByScript(Logger::LAZY_COMPILE_TAG, *script),
diff --git a/test/cctest/test-cpu-profiler.cc b/test/cctest/test-cpu-profiler.cc
index 95930b4c2d..a615fe954e 100644
--- a/test/cctest/test-cpu-profiler.cc
+++ b/test/cctest/test-cpu-profiler.cc
@@ -917,89 +917,3 @@ TEST(NativeMethodMonomorphicIC) {
 
   cpu_profiler->DeleteAllCpuProfiles();
 }
-
-
-static const char* cpu_profiler_sourceURL_source =
-"function start(timeout) {\n"
-"  var start = Date.now();\n"
-"  var duration = 0;\n"
-"  do {\n"
-"    try {\n"
-"      duration = Date.now() - start;\n"
-"    } catch(e) { }\n"
-"  } while (duration < timeout);\n"
-"  return duration;\n"
-"}\n"
-"//# sourceURL=cpu_profiler_sourceURL_source.js";
-
-
-TEST(SourceURLSupportForNewFunctions) {
-  LocalContext env;
-  v8::HandleScope scope(env->GetIsolate());
-
-  v8::Script::Compile(v8::String::New(cpu_profiler_sourceURL_source))->Run();
-  v8::Local<v8::Function> function = v8::Local<v8::Function>::Cast(
-      env->Global()->Get(v8::String::New("start")));
-  v8::CpuProfiler* cpu_profiler = env->GetIsolate()->GetCpuProfiler();
-  int32_t profiling_interval_ms = 200;
-#if defined(_WIN32) || defined(_WIN64)
-  // 200ms is not enough on Windows. See
-  // https://code.google.com/p/v8/issues/detail?id=2628
-  profiling_interval_ms = 500;
-#endif
-
-  // Cold run.
-  v8::Local<v8::String> profile_name = v8::String::New("my_profile");
-  cpu_profiler->StartCpuProfiling(profile_name);
-  v8::Handle<v8::Value> args[] = { v8::Integer::New(profiling_interval_ms) };
-  function->Call(env->Global(), ARRAY_SIZE(args), args);
-  const v8::CpuProfile* profile = cpu_profiler->StopCpuProfiling(profile_name);
-  CHECK_NE(NULL, profile);
-
-  // Dump collected profile to have a better diagnostic in case of failure.
-  reinterpret_cast<i::CpuProfile*>(
-      const_cast<v8::CpuProfile*>(profile))->Print();
-  const v8::CpuProfileNode* root = profile->GetTopDownRoot();
-  const v8::CpuProfileNode* startNode = GetChild(root, "start");
-
-  CHECK_EQ(v8::String::New("cpu_profiler_sourceURL_source.js"),
-           startNode->GetScriptResourceName());
-
-  cpu_profiler->DeleteAllCpuProfiles();
-}
-
-TEST(LogExistingFunctionSourceURLCheck) {
-  LocalContext env;
-  v8::HandleScope scope(env->GetIsolate());
-
-  v8::Script::Compile(v8::String::New(cpu_profiler_sourceURL_source))->Run();
-  v8::Local<v8::Function> function = v8::Local<v8::Function>::Cast(
-      env->Global()->Get(v8::String::New("start")));
-  v8::CpuProfiler* cpu_profiler = env->GetIsolate()->GetCpuProfiler();
-  int32_t profiling_interval_ms = 200;
-
-  // Warm up.
-  v8::Handle<v8::Value> args[] = { v8::Integer::New(profiling_interval_ms) };
-  function->Call(env->Global(), ARRAY_SIZE(args), args);
-
-#if defined(_WIN32) || defined(_WIN64)
-  // 200ms is not enough on Windows. See
-  // https://code.google.com/p/v8/issues/detail?id=2628
-  profiling_interval_ms = 500;
-#endif
-  v8::Local<v8::String> profile_name = v8::String::New("my_profile");
-  cpu_profiler->StartCpuProfiling(profile_name);
-  function->Call(env->Global(), ARRAY_SIZE(args), args);
-  const v8::CpuProfile* profile = cpu_profiler->StopCpuProfiling(profile_name);
-  CHECK_NE(NULL, profile);
-
-  // Dump collected profile to have a better diagnostic in case of failure.
-  reinterpret_cast<i::CpuProfile*>(
-      const_cast<v8::CpuProfile*>(profile))->Print();
-  const v8::CpuProfileNode* root = profile->GetTopDownRoot();
-  const v8::CpuProfileNode* startNode = GetChild(root, "start");
-  CHECK_EQ(v8::String::New("cpu_profiler_sourceURL_source.js"),
-           startNode->GetScriptResourceName());
-
-  cpu_profiler->DeleteAllCpuProfiles();
-}