diff --git a/core/src/main/java/hudson/taglibs/LayoutTagLib.java b/core/src/main/java/hudson/taglibs/LayoutTagLib.java
deleted file mode 100644
index 4056b9f57df8f13ca181a88aa8a9d6f9389bfb84..0000000000000000000000000000000000000000
--- a/core/src/main/java/hudson/taglibs/LayoutTagLib.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package hudson.taglibs;
-
-import groovy.lang.Closure;
-import org.kohsuke.stapler.jelly.groovy.TagLibraryUri;
-import org.kohsuke.stapler.jelly.groovy.TypedTagLibrary;
-
-import java.util.Map;
-
-/**
- * Experimenting. This is to be auto-generated.
- *
- * @author Kohsuke Kawaguchi
- */
-@TagLibraryUri("/lib/layout")
-public interface LayoutTagLib extends TypedTagLibrary {
-    void layout(Map args, Closure body);
-    void layout(Map args);
-    void layout(Closure body);
-    void layout();
-
-    void main_panel(Closure c);
-}
diff --git a/core/src/main/resources/hudson/model/Hudson/manag_.groovy b/core/src/main/resources/hudson/model/Hudson/manag_.groovy
index 77ed9fd48f6739b030b3b8b3a179454d9541cdc7..529e832507dbffbbcfee79a340b4a1d6df95f99f 100644
--- a/core/src/main/resources/hudson/model/Hudson/manag_.groovy
+++ b/core/src/main/resources/hudson/model/Hudson/manag_.groovy
@@ -1,6 +1,6 @@
-import hudson.taglibs.LayoutTagLib
+package hudson.model.Hudson;
 
-l=namespace(LayoutTagLib)
+l=namespace(lib.LayoutTagLib)
 t=namespace("/lib/hudson")
 st=namespace("jelly:stapler")