diff --git a/LFS/lfs.xsl b/LFS/lfs.xsl
index 5fdc153..771dc85 100644
--- a/LFS/lfs.xsl
+++ b/LFS/lfs.xsl
@@ -53,15 +53,19 @@
   </xsl:template>
   
   <xsl:template match="sect1">
+<!-- Since this xsl:if tag encloses the whole template, it would
+     be much better to transpose this condition to the select part
+     of the "calling" apply-template. But that would change the numbering,
+     so that it would be difficult to compare to previous versions. So for
+     version 2.4, let us keep this -->
         <xsl:if test="(../@id='chapter-temporary-tools' or
                   ../@id='chapter-building-system' or
                   ../@id='chapter-bootscripts' or
                   ../@id='chapter-bootable') and
-                  count(descendant::screen/userinput) &gt; 0 and
-                  count(descendant::screen/userinput) &gt;
-                      count(descendant::screen[@role='nodump']) and
-                  count(descendant::screen/userinput) &gt;
-                      count(descendant::screen/userinput[starts-with(string(),'chroot')])">
+                  (sect2[not(@revision) or @revision=$revision]//..|.)/
+                      screen[(not(@role) or @role != 'nodump') and
+                             (not(@revision) or @revision=$revision)]/
+                          userinput[not(starts-with(string(),'chroot'))]">
 <!-- The last condition is a hack to allow previous versions of the
      book where the chroot commands did not have role="nodump".
      It only works if the chroot command is the only one on the page -->