diff --git a/src/compiler/glsl/gl_nir_lower_xfb_varying.c b/src/compiler/glsl/gl_nir_lower_xfb_varying.c
index 30df6d1d05d..fc3fd1f599d 100644
--- a/src/compiler/glsl/gl_nir_lower_xfb_varying.c
+++ b/src/compiler/glsl/gl_nir_lower_xfb_varying.c
@@ -155,8 +155,7 @@ gl_nir_lower_xfb_varying(nir_shader *shader, const char *old_var_name,
 {
    nir_function_impl *impl = nir_shader_get_entrypoint(shader);
 
-   nir_builder b = nir_builder_create(impl);
-   b.cursor = nir_before_block(nir_start_block(impl));
+   nir_builder b = nir_builder_at(nir_before_block(nir_start_block(impl)));
 
    nir_deref_instr *deref = NULL;
    const struct glsl_type *type = NULL;
diff --git a/src/compiler/glsl/glsl_to_nir.cpp b/src/compiler/glsl/glsl_to_nir.cpp
index dda2b630b66..d6e29f825ee 100644
--- a/src/compiler/glsl/glsl_to_nir.cpp
+++ b/src/compiler/glsl/glsl_to_nir.cpp
@@ -805,8 +805,7 @@ nir_visitor::visit(ir_function_signature *ir)
 
       this->is_global = false;
 
-      b = nir_builder_create(impl);
-      b.cursor = nir_after_cf_list(&impl->body);
+      b = nir_builder_at(nir_after_cf_list(&impl->body));
 
       unsigned i = (ir->return_type != glsl_type::void_type) ? 1 : 0;