diff --git a/src/mips/code-stubs-mips.cc b/src/mips/code-stubs-mips.cc
index 7a0335707a..c349f6b141 100644
--- a/src/mips/code-stubs-mips.cc
+++ b/src/mips/code-stubs-mips.cc
@@ -122,8 +122,7 @@ void HydrogenCodeStub::GenerateLightweightMiss(MacroAssembler* masm) {
   // Update the static counter each time a new code stub is generated.
   isolate()->counters()->code_stubs()->Increment();
 
-  CodeStubInterfaceDescriptor descriptor;
-  InitializeInterfaceDescriptor(&descriptor);
+  CodeStubInterfaceDescriptor descriptor(this);
   int param_count = descriptor.GetEnvironmentParameterCount();
   {
     // Call the runtime system in a fresh internal frame.
diff --git a/src/mips/lithium-mips.cc b/src/mips/lithium-mips.cc
index 2f26ee1d15..760d427a68 100644
--- a/src/mips/lithium-mips.cc
+++ b/src/mips/lithium-mips.cc
@@ -2405,8 +2405,7 @@ LInstruction* LChunkBuilder::DoParameter(HParameter* instr) {
     return DefineAsSpilled(result, spill_index);
   } else {
     DCHECK(info()->IsStub());
-    CodeStubInterfaceDescriptor descriptor;
-    info()->code_stub()->InitializeInterfaceDescriptor(&descriptor);
+    CodeStubInterfaceDescriptor descriptor(info()->code_stub());
     int index = static_cast<int>(instr->index());
     Register reg = descriptor.GetEnvironmentParameterRegister(index);
     return DefineFixed(result, reg);
diff --git a/src/mips64/code-stubs-mips64.cc b/src/mips64/code-stubs-mips64.cc
index 4ed30ccc40..4a716ec232 100644
--- a/src/mips64/code-stubs-mips64.cc
+++ b/src/mips64/code-stubs-mips64.cc
@@ -121,8 +121,7 @@ void HydrogenCodeStub::GenerateLightweightMiss(MacroAssembler* masm) {
   // Update the static counter each time a new code stub is generated.
   isolate()->counters()->code_stubs()->Increment();
 
-  CodeStubInterfaceDescriptor descriptor;
-  InitializeInterfaceDescriptor(&descriptor);
+  CodeStubInterfaceDescriptor descriptor(this);
   int param_count = descriptor.GetEnvironmentParameterCount();
   {
     // Call the runtime system in a fresh internal frame.
diff --git a/src/mips64/lithium-mips64.cc b/src/mips64/lithium-mips64.cc
index 3afa22d676..649361441b 100644
--- a/src/mips64/lithium-mips64.cc
+++ b/src/mips64/lithium-mips64.cc
@@ -2405,8 +2405,7 @@ LInstruction* LChunkBuilder::DoParameter(HParameter* instr) {
     return DefineAsSpilled(result, spill_index);
   } else {
     DCHECK(info()->IsStub());
-    CodeStubInterfaceDescriptor descriptor;
-    info()->code_stub()->InitializeInterfaceDescriptor(&descriptor);
+    CodeStubInterfaceDescriptor descriptor(info()->code_stub());
     int index = static_cast<int>(instr->index());
     Register reg = descriptor.GetEnvironmentParameterRegister(index);
     return DefineFixed(result, reg);