diff --git a/roles/distgit/templates/genacls.pkgdb b/roles/distgit/templates/genacls.pkgdb
index c1920b108b..8c88207cd7 100644
--- a/roles/distgit/templates/genacls.pkgdb
+++ b/roles/distgit/templates/genacls.pkgdb
@@ -131,7 +131,6 @@ if __name__ == '__main__':
                         (pkg, ACTIVE[branch])
                     )
 
-            {% if env != 'staging' %}
             print ''
             print 'repo %s%s' % (key, pkg)
             print '\n'.join(buffer)
@@ -140,8 +139,8 @@ if __name__ == '__main__':
             print '    RWC  refs/tags/ = %s' % ' '.join(writers)
             if masters:
                 print '    RWC      = %s' % ' '.join(masters)
-            {% endif %}
 
+            {% if env != 'staging' %}
             # Bring backward compatibility while we keep the symlinks in place
             # from the old to the new locations.
             if key == 'rpms/':
@@ -153,5 +152,6 @@ if __name__ == '__main__':
                 print '    RWC  refs/tags/ = %s' % ' '.join(writers)
                 if masters:
                     print '    RWC      = %s' % ' '.join(masters)
+            {% endif %}
 
     sys.exit(0)