--- a/toolkit/moz.configure
+++ b/toolkit/moz.configure
@@ -754,38 +754,23 @@ def bindgen_config_paths(llvm_config, li
         The argument to --with-clang-path is not a file: {}
         '''.format(clang_path)))
 
     return namespace(
         libclang_path=libclang_path[0],
         clang_path=clang_path[0],
     )
 
-@depends(stylo_config, bindgen_config_paths, '--enable-stylo-build-bindgen')
-@imports(_from='textwrap', _import='dedent')
-def stylo(stylo_config, bindgen_config_paths, bindgen_enabled):
-    if not stylo_config.build:
-        return None
-    elif not bindgen_enabled:
-        return namespace(
-            build=bool(stylo_config.build)
-        )
-
-    return namespace(
-        libclang_path=bindgen_config_paths.libclang_path,
-        clang_path=bindgen_config_paths.clang_path,
-    )
-
 set_config('MOZ_STYLO', stylo_config.build)
 set_define('MOZ_STYLO', stylo_config.build)
 set_config('MOZ_STYLO_ENABLE', stylo_config.enable)
 set_define('MOZ_STYLO_ENABLE', stylo_config.enable)
 
-set_config('MOZ_LIBCLANG_PATH', stylo.libclang_path)
-set_config('MOZ_CLANG_PATH', stylo.clang_path)
+set_config('MOZ_LIBCLANG_PATH', bindgen_config_paths.libclang_path)
+set_config('MOZ_CLANG_PATH', bindgen_config_paths.clang_path)
 set_config('MOZ_STYLO_BINDGEN', depends_if('--enable-stylo-build-bindgen')(lambda _: True))
 
 option('--with-servo', env='SERVO_TARGET_DIR', nargs=1,
        help='Absolute path of the target directory where libgeckoservo can '
             'be found. This is generally servo_src_dir/target/release.')
 
 @depends_if('--with-servo')
 def servo_target_dir(value):